Merge pull request #4356 from bacongobbler/fixup-router

fix(router): revert symlink to /dev/stdout

Author: Matthew Fisher

router/Dockerfile

@@ -21,10 +21,6 @@ RUN addgroup -S nginx && \
 
 COPY rootfs /
 
-# forward request and error logs to docker
-RUN ln -sf /dev/stdout /opt/nginx/logs/access.log
-RUN ln -sf /dev/stderr /opt/nginx/logs/error.log
-
 # compile nginx from source
 RUN build
 

router/cmd/boot/boot.go

@@ -11,6 +11,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/ActiveState/tail"
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/go-etcd/etcd"
 
@@ -20,8 +21,10 @@ import (
 var log = logrus.New()
 
 const (
-	timeout time.Duration = 10 * time.Second
-	ttl     time.Duration = timeout * 2
+	timeout        time.Duration = 10 * time.Second
+	ttl            time.Duration = timeout * 2
+	nginxAccessLog string        = "/opt/nginx/logs/access.log"
+	nginxErrorLog  string        = "/opt/nginx/logs/error.log"
 )
 
 func main() {
@@ -62,6 +65,9 @@ func main() {
 
 	log.Info("Starting Nginx...")
 
+	go tailFile(nginxAccessLog)
+	go tailFile(nginxErrorLog)
+
 	nginxChan := make(chan bool)
 	go launchNginx(nginxChan)
 	<-nginxChan
@@ -80,6 +86,7 @@ func main() {
 	exitChan := make(chan os.Signal, 2)
 	signal.Notify(exitChan, syscall.SIGTERM, syscall.SIGINT)
 	<-exitChan
+	tail.Cleanup()
 }
 
 func launchCron() {
@@ -161,6 +168,15 @@ func mkfifo(path string) {
 	}
 }
 
+func tailFile(path string) {
+	mkfifo(path)
+	t, _ := tail.TailFile(path, tail.Config{Follow: true})
+
+	for line := range t.Lines {
+		log.Info(line.Text)
+	}
+}
+
 func publishService(
 	client *etcd.Client,
 	etcdPath string,