From c459b4bda76e3e920fff7d671f4ce3a322dcc246 Mon Sep 17 00:00:00 2001
From: "Fabrizio (Misto) Milo" <mistobaan@gmail.com>
Date: Wed, 14 Aug 2013 17:58:00 -0700
Subject: [PATCH] go flavour

---
 etcd.go        | 4 ++--
 etcd_server.go | 6 +++---
 raft_server.go | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etcd.go b/etcd.go
index df58f3716..7f2f3f769 100644
--- a/etcd.go
+++ b/etcd.go
@@ -197,7 +197,7 @@ func main() {
 	r = newRaftServer(info.Name, info.RaftURL, &raftTLSConfig, &info.RaftTLS)
 
 	startWebInterface()
-	r.run()
-	e.run()
+	r.ListenAndServe()
+	e.ListenAndServe()
 
 }
diff --git a/etcd_server.go b/etcd_server.go
index 9237a6b7c..51ff1e9e8 100644
--- a/etcd_server.go
+++ b/etcd_server.go
@@ -36,13 +36,13 @@ func newEtcdServer(name string, urlStr string, tlsConf *TLSConfig, tlsInfo *TLSI
 }
 
 // Start to listen and response etcd client command
-func (e *etcdServer) run() {
+func (e *etcdServer) ListenAndServe() {
 
 	infof("etcd server [%s:%s]", e.name, e.url)
 
 	if e.tlsConf.Scheme == "http" {
-		fatal(e.ListenAndServe())
+		fatal(e.Server.ListenAndServe())
 	} else {
-		fatal(e.ListenAndServeTLS(e.tlsInfo.CertFile, e.tlsInfo.KeyFile))
+		fatal(e.Server.ListenAndServeTLS(e.tlsInfo.CertFile, e.tlsInfo.KeyFile))
 	}
 }
diff --git a/raft_server.go b/raft_server.go
index f2d521ea5..00d07f59b 100644
--- a/raft_server.go
+++ b/raft_server.go
@@ -42,7 +42,7 @@ func newRaftServer(name string, url string, tlsConf *TLSConfig, tlsInfo *TLSInfo
 }
 
 // Start the raft server
-func (r *raftServer) run() {
+func (r *raftServer) ListenAndServe() {
 
 	// Setup commands.
 	registerCommands()