ref(logger): just use go. remove bash script.

Author: aledbf

logger/Dockerfile

@@ -1,36 +1,7 @@
-FROM ubuntu:14.04
+FROM deis/go:latest
 
-ENV DEBIAN_FRONTEND noninteractive
+WORKDIR /go/src/github.com/deis/deis/logger
+CMD /go/bin/syslogd
 
-# install common packages
-RUN apt-get update && apt-get install -y curl
-
-# install etcdctl
-RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
-    && chmod +x /usr/local/bin/etcdctl
-
-# install confd
-RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
-    && chmod +x /usr/local/bin/confd
-
-# install go runtime
-RUN curl -sSL https://storage.googleapis.com/golang/go1.3.1.linux-amd64.tar.gz | tar -C /usr/local -xz
-
-# prepare go environment
-RUN mkdir -p /go
-ENV GOPATH /go
-ENV PATH /usr/local/bin:/usr/bin:/bin:/sbin:/usr/local/go/bin
-
-# create /var/log/deis for holding logs (access via bind mount)
-RUN mkdir -p /var/log/deis
-
-# prepare execution environment
-WORKDIR /app
-CMD ["/app/bin/boot"]
-EXPOSE 514
-
-ADD . /app
 ADD . /go/src/github.com/deis/deis/logger
-
-# compile the binary
-RUN cd /go/src/github.com/deis/deis/logger/syslogd && go install -v .
+RUN CGO_ENABLED=0 go get -a -ldflags '-s' github.com/deis/deis/logger

logger/Makefile

@@ -2,10 +2,14 @@ include ../includes.mk
 
 COMPONENT = logger
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
+BUILD_IMAGE := $(COMPONENT)-build
 DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
 
 build: check-docker
-	docker build -t $(IMAGE) .
+	docker build -t $(BUILD_IMAGE) .	
+	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/logger image/bin/
+	docker build -t $(IMAGE) image
+	rm -rf image/bin/logger
 
 clean: check-docker check-registry
 	docker rmi $(IMAGE)

logger/bin/boot

@@ -0,0 +1,6 @@
+FROM scratch
+
+CMD ["/bin/logger"]
+EXPOSE 514
+
+ADD . /

logger/image/Dockerfile

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"log"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/coreos/go-etcd/etcd"
+
+	"github.com/deis/deis/logger/syslogd"
+)
+
+const (
+	timeout time.Duration = 10 * time.Second
+	ttl     time.Duration = timeout * 2
+)
+
+func main() {
+	host := getopt("HOST", "127.0.0.1")
+
+	etcdPort := getopt("ETCD_PORT", "4001")
+	etcdPath := getopt("ETCD_PATH", "/deis/logs")
+
+	externalPort := getopt("EXTERNAL_PORT", "514")
+
+	client := etcd.NewClient([]string{"http://" + host + ":" + etcdPort})
+
+	// Wait for terminating signal
+	exitChan := make(chan os.Signal, 2)
+	cleanupChan := make(chan bool)
+	signal.Notify(exitChan, syscall.SIGTERM, syscall.SIGINT)
+
+	go syslogd.Listen(exitChan, cleanupChan)
+
+	go publishService(client, host, etcdPath, externalPort, uint64(ttl.Seconds()))
+
+	// Wait for the proper shutdown of the syslog server before exit
+	<-cleanupChan
+}
+
+func publishService(client *etcd.Client, host string, etcdPath string, externalPort string, ttl uint64) {
+	for {
+		setEtcd(client, etcdPath+"/host", host, ttl)
+		setEtcd(client, etcdPath+"/port", externalPort, ttl)
+		time.Sleep(timeout)
+	}
+}
+
+func setEtcd(client *etcd.Client, key, value string, ttl uint64) {
+	_, err := client.Set(key, value, ttl)
+	if err != nil {
+		log.Println(err)
+	}
+}
+
+func getopt(name, dfault string) string {
+	value := os.Getenv(name)
+	if value == "" {
+		value = dfault
+	}
+	return value
+}

logger/main.go

@@ -1,14 +1,12 @@
-package main
+package syslogd
 
 import (
 	"fmt"
 	"io"
 	"log"
 	"os"
-	"os/signal"
 	"path"
 	"regexp"
-	"syscall"
 
 	"github.com/deis/deis/logger/syslog"
 )
@@ -92,18 +90,19 @@ func (h *handler) mainLoop() {
 	h.End()
 }
 
-func main() {
+func Listen(signalChan chan os.Signal, cleanupDone chan bool) {
+	fmt.Println("Starting syslog...")
 	// Create a server with one handler and run one listen gorutine
 	s := syslog.NewServer()
 	s.AddHandler(newHandler())
 	s.Listen("0.0.0.0:514")
+	fmt.Println("Syslog server started...")
 
 	// Wait for terminating signal
-	sc := make(chan os.Signal, 2)
-	signal.Notify(sc, syscall.SIGTERM, syscall.SIGINT)
-	<-sc
-
-	// Shutdown the server
-	fmt.Println("Shutting down...")
-	s.Shutdown()
+	for _ = range signalChan {
+		// Shutdown the server
+		fmt.Println("Shutting down...")
+		s.Shutdown()
+		cleanupDone <- true
+	}
 }