Merge pull request #338 from gliderlabs/mh/fix/strip-hostname

strip \r and \n when reading the file /etc/host_hostname

Author: michaelshobbs

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 ENTRYPOINT ["/bin/logspout"]
 VOLUME /mnt/routes
 EXPOSE 80

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 VOLUME /mnt/routes
 EXPOSE 80
 

Makefile

@@ -49,6 +49,7 @@ test: build-dev
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v $(PWD):/go/src/github.com/gliderlabs/logspout \
 		-e TEST_ARGS="" \
+		-e DEBUG=$(DEBUG) \
 		$(NAME):dev make -e test-direct
 
 test-direct:

adapters/syslog/syslog.go

@@ -10,6 +10,7 @@ import (
 	"net"
 	"os"
 	"strconv"
+	"strings"
 	"syscall"
 	"text/template"
 	"time"
@@ -55,6 +56,16 @@ func debug(v ...interface{}) {
 	}
 }
 
+func getHostname() string {
+	content, err := ioutil.ReadFile("/etc/host_hostname")
+	if err == nil && len(content) > 0 {
+		hostname = strings.TrimRight(string(content), "\r\n")
+	} else {
+		hostname = getopt("SYSLOG_HOSTNAME", "{{.Container.Config.Hostname}}")
+	}
+	return hostname
+}
+
 // NewSyslogAdapter returnas a configured syslog.Adapter
 func NewSyslogAdapter(route *router.Route) (router.LogAdapter, error) {
 	transport, found := router.AdapterTransports.Lookup(route.AdapterTransport("udp"))
@@ -69,13 +80,8 @@ func NewSyslogAdapter(route *router.Route) (router.LogAdapter, error) {
 	format := getopt("SYSLOG_FORMAT", "rfc5424")
 	priority := getopt("SYSLOG_PRIORITY", "{{.Priority}}")
 	pid := getopt("SYSLOG_PID", "{{.Container.State.Pid}}")
+	hostname = getHostname()
 
-	content, err := ioutil.ReadFile("/etc/host_hostname") // just pass the file name
-	if err == nil && len(content) > 0{
-		hostname = string(content) // convert content to a 'string'
-	} else {
-		hostname = getopt("SYSLOG_HOSTNAME", "{{.Container.Config.Hostname}}")
-	}
 	tag := getopt("SYSLOG_TAG", "{{.ContainerName}}"+route.Options["append_tag"])
 	structuredData := getopt("SYSLOG_STRUCTURED_DATA", "")
 	if route.Options["structured_data"] != "" {

adapters/syslog/syslog_test.go

@@ -4,10 +4,12 @@ import (
 	"bufio"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"log"
 	"net"
 	"os"
 	"strconv"
+	"strings"
 	"sync"
 	"testing"
 	"text/template"
@@ -41,6 +43,9 @@ var (
 	}
 	testTmplStr = fmt.Sprintf("<%s>%s %s %s[%s]: %s\n",
 		testPriority, testTimestamp, testHostname, testTag, testPid, testData)
+	hostHostnameFilename = "/etc/host_hostname"
+	hostnameContent      = "hostname"
+	badHostnameContent   = "hostname\r\n"
 )
 
 func TestSyslogRetryCount(t *testing.T) {
@@ -102,6 +107,16 @@ func TestSyslogReconnectOnClose(t *testing.T) {
 	}
 }
 
+func TestHostnameDoesNotHaveLineFeed(t *testing.T) {
+	if err := ioutil.WriteFile(hostHostnameFilename, []byte(badHostnameContent), 0777); err != nil {
+		t.Fatal(err)
+	}
+	testHostname := getHostname()
+	if strings.Contains(testHostname, badHostnameContent) {
+		t.Errorf("expected hostname to be %s. got %s in hostname %s", hostnameContent, badHostnameContent, testHostname)
+	}
+}
+
 func startServer(n, la string, done chan<- string) (addr string, sock io.Closer, wg *sync.WaitGroup) {
 	if n == "udp" || n == "tcp" {
 		la = "127.0.0.1:0"

circle.yml

@@ -2,10 +2,9 @@ version: 2
 jobs:
   build:
     machine: true
-    working_directory: ~/.go_workspace/src/github.com/gliderlabs/
+    working_directory: ~/.go_workspace/src/github.com/gliderlabs/logspout
     environment:
       DEBUG: true
-      GO_PROJECT: ../go/src/github.com/gliderlabs/$CIRCLE_PROJECT_REPONAME
     steps:
       - checkout
       - run: |