From 91fc6aabd293a26b72642c32500392b6c78bb654 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Sat, 18 Jan 2014 10:10:06 -0800 Subject: [PATCH] chore(gofmt): Run gofmt --- etcd.go | 24 ++++++++++++------------ server/peer_server.go | 26 +++++++++++++------------- server/server.go | 12 ++++++------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/etcd.go b/etcd.go index e03b6f1ad..d24814840 100644 --- a/etcd.go +++ b/etcd.go @@ -111,25 +111,25 @@ func main() { // Create peer server. psConfig := server.PeerServerConfig{ - Name: info.Name, - Path: config.DataDir, - URL: info.RaftURL, - BindAddr: info.RaftListenHost, - SnapshotCount: config.SnapshotCount, + Name: info.Name, + Path: config.DataDir, + URL: info.RaftURL, + BindAddr: info.RaftListenHost, + SnapshotCount: config.SnapshotCount, HeartbeatTimeout: time.Duration(config.Peer.HeartbeatTimeout) * time.Millisecond, - ElectionTimeout: time.Duration(config.Peer.ElectionTimeout) * time.Millisecond, - MaxClusterSize: config.MaxClusterSize, - RetryTimes: config.MaxRetryAttempts, - CORS: corsInfo, + ElectionTimeout: time.Duration(config.Peer.ElectionTimeout) * time.Millisecond, + MaxClusterSize: config.MaxClusterSize, + RetryTimes: config.MaxRetryAttempts, + CORS: corsInfo, } ps := server.NewPeerServer(psConfig, &peerTLSConfig, &info.RaftTLS, registry, store, &mb) // Create client server. sConfig := server.ServerConfig{ - Name: info.Name, - URL: info.EtcdURL, + Name: info.Name, + URL: info.EtcdURL, BindAddr: info.EtcdListenHost, - CORS: corsInfo, + CORS: corsInfo, } s := server.New(sConfig, &tlsConfig, &info.EtcdTLS, ps, registry, store, &mb) diff --git a/server/peer_server.go b/server/peer_server.go index 92da00434..b5d8fde38 100644 --- a/server/peer_server.go +++ b/server/peer_server.go @@ -40,19 +40,19 @@ type PeerServerConfig struct { } type PeerServer struct { - Config PeerServerConfig - raftServer raft.Server - server *Server - httpServer *http.Server - listener net.Listener - joinIndex uint64 - tlsConf *TLSConfig - tlsInfo *TLSInfo - followersStats *raftFollowersStats - serverStats *raftServerStats - registry *Registry - store store.Store - snapConf *snapshotConf + Config PeerServerConfig + raftServer raft.Server + server *Server + httpServer *http.Server + listener net.Listener + joinIndex uint64 + tlsConf *TLSConfig + tlsInfo *TLSInfo + followersStats *raftFollowersStats + serverStats *raftServerStats + registry *Registry + store store.Store + snapConf *snapshotConf closeChan chan bool timeoutThresholdChan chan interface{} diff --git a/server/server.go b/server/server.go index c690c060a..99f440e66 100644 --- a/server/server.go +++ b/server/server.go @@ -57,12 +57,12 @@ func New(sConfig ServerConfig, tlsConf *TLSConfig, tlsInfo *TLSInfo, peerServer TLSConfig: &tlsConf.Server, Addr: sConfig.BindAddr, }, - store: store, - registry: registry, - tlsConf: tlsConf, - tlsInfo: tlsInfo, - peerServer: peerServer, - router: r, + store: store, + registry: registry, + tlsConf: tlsConf, + tlsInfo: tlsInfo, + peerServer: peerServer, + router: r, corsMiddleware: cors, metrics: mb, }