Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coreos/etcd into logging

Browse Source
This commit is contained in:
Ben Johnson
2014-01-08 16:50:51 -07:00
parent 355bd6df9b e02441acb1
commit 53477af1eb
12 changed files with 1428 additions and 1179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/config_test.go
View File

@@ -29,7 +29,6 @@ func TestConfigTOML(t *testing.T) {
snapshot = true
verbose = true
very_verbose = true
web_url = "/web"
[peer]
addr = "127.0.0.1:7002"
@@ -82,7 +81,6 @@ func TestConfigEnv(t *testing.T) {
os.Setenv("ETCD_SNAPSHOT", "true")
os.Setenv("ETCD_VERBOSE", "1")
os.Setenv("ETCD_VERY_VERBOSE", "yes")
os.Setenv("ETCD_WEB_URL", "/web")
os.Setenv("ETCD_PEER_ADDR", "127.0.0.1:7002")
os.Setenv("ETCD_PEER_CA_FILE", "/tmp/peer/file.ca")
os.Setenv("ETCD_PEER_CERT_FILE", "/tmp/peer/file.cert")

7
server/peer_server.go
View File

@@ -77,6 +77,7 @@ func NewPeerServer(name string, path string, url string, bindAddr string, tlsCon
Followers: make(map[string]*raftFollowerStats),
},
serverStats: &raftServerStats{
Name: name,
StartTime: time.Now(),
sendRateQueue: &statsQueue{
back: -1,
@@ -422,6 +423,12 @@ func (s *PeerServer) joinByPeer(server raft.Server, peer string, scheme string)
func (s *PeerServer) Stats() []byte {
s.serverStats.LeaderInfo.Uptime = time.Now().Sub(s.serverStats.LeaderInfo.startTime).String()
// TODO: register state listener to raft to change this field
// rather than compare the state each time Stats() is called.
if s.RaftServer().State() == raft.Leader {
s.serverStats.LeaderInfo.Name = s.RaftServer().Name()
}
queue := s.serverStats.sendRateQueue
s.serverStats.SendingPkgRate, s.serverStats.SendingBandwidthRate = queue.Rate()