remove etcd dependency inside syslogd (TODO: squash this commit)

Author: kalbasit

logger/main.go

@@ -45,7 +45,8 @@ func main() {
 	client := etcd.NewClient([]string{"http://" + publishHost + ":" + publishPort})
 
 	signalChan := make(chan os.Signal, 1)
-	drainChan := make(chan *etcd.Response)
+	drainRespChan := make(chan *etcd.Response)
+	drainChan := make(chan string)
 	stopChan := make(chan bool)
 	exitChan := make(chan bool)
 	cleanupChan := make(chan bool)
@@ -56,14 +57,16 @@ func main() {
 		setEtcd(client, publishPath+"/drain", drainURI, 0)
 	}
 
-	go client.Watch(publishPath+"/drain", 0, false, drainChan, stopChan)
+	go client.Watch(publishPath+"/drain", 0, false, drainRespChan, stopChan)
 	go syslogd.Listen(exitChan, cleanupChan, drainChan, fmt.Sprintf("%s:%d", logAddr, logPort))
 	if enablePublish {
 		go publishService(exitChan, client, publishHost, publishPath, strconv.Itoa(logPort), uint64(time.Duration(publishTTL).Seconds()))
 	}
 
 	for {
 		select {
+		case er := <-drainRespChan:
+			drainChan <- er.Node.Value
 		case <-signalChan:
 			close(exitChan)
 			stopChan <- true

logger/syslogd/syslogd.go

@@ -8,7 +8,6 @@ import (
 	"path"
 	"regexp"
 
-	"github.com/coreos/go-etcd/etcd"
 	"github.com/deis/deis/logger/syslog"
 
 	"github.com/deis/deis/logger/drain"
@@ -102,7 +101,7 @@ func (h *handler) mainLoop() {
 }
 
 // Listen starts a new syslog server which runs until it receives a signal.
-func Listen(exitChan, cleanupDone chan bool, drainChan chan *etcd.Response, bindAddr string) {
+func Listen(exitChan, cleanupDone chan bool, drainChan chan string, bindAddr string) {
 	fmt.Println("Starting syslog...")
 	// If LogRoot doesn't exist, create it
 	// equivalent to Python's `if not os.path.exists(filename)`
@@ -127,8 +126,8 @@ func Listen(exitChan, cleanupDone chan bool, drainChan chan *etcd.Response, bind
 			fmt.Println("Shutting down...")
 			s.Shutdown()
 			cleanupDone <- true
-		case er := <-drainChan:
-			h.drainURI = er.Node.Value
+		case d := <-drainChan:
+			h.drainURI = d
 		}
 	}
 }