Merge pull request #346 from jgreat/strip-log-headers

Strip header bytes from log stream

Author: michaelshobbs

glide.lock

@@ -1,7 +1,10 @@
 package: github.com/gliderlabs/logspout
+excludeDirs:
+- custom
 import:
 - package: github.com/fsouza/go-dockerclient
 - package: github.com/gorilla/mux
 - package: golang.org/x/net
   subpackages:
   - websocket
+- package: github.com/hashicorp/go-version

glide.yaml

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/fsouza/go-dockerclient"
+	"github.com/hashicorp/go-version"
 )
 
 var allowTTY bool
@@ -180,6 +181,10 @@ func (p *LogsPump) Run() error {
 
 func (p *LogsPump) pumpLogs(event *docker.APIEvents, backlog bool, inactivityTimeout time.Duration) {
 	id := normalID(event.ID)
+
+	dockerVersion, err := p.client.Version()
+	assert(err, "Could not get Docker Version endpoint")
+
 	container, err := p.client.InspectContainer(id)
 	assert(err, "pump")
 	if ignoreContainerTTY(container) {
@@ -211,7 +216,7 @@ func (p *LogsPump) pumpLogs(event *docker.APIEvents, backlog bool, inactivityTim
 	}
 	outrd, outwr := io.Pipe()
 	errrd, errwr := io.Pipe()
-	p.pumps[id] = newContainerPump(container, outrd, errrd)
+	p.pumps[id] = newContainerPump(container, dockerVersion, outrd, errrd)
 	p.mu.Unlock()
 	p.update(event)
 	go func() {
@@ -339,14 +344,32 @@ type containerPump struct {
 	logstreams map[chan *Message]*Route
 }
 
-func newContainerPump(container *docker.Container, stdout, stderr io.Reader) *containerPump {
+func newContainerPump(container *docker.Container, dockerVersion *docker.Env, stdout, stderr io.Reader) *containerPump {
+	apiVersion := dockerVersion.Get("ApiVersion")
+	debug("API Version: ", apiVersion)
+	debug("TTY is: ", container.Config.Tty)
+	earliestAPI, _ := version.NewVersion("1.13")
+	currentAPI, err := version.NewVersion(apiVersion)
+	assert(err, "current docker api version is not valid version string")
+	hasHeaders := false
+	if container.Config.Tty == false {
+		if currentAPI.Compare(earliestAPI) >= 0 {
+			hasHeaders = true
+		}
+	}
+	debug("hasHeaders set to: ", hasHeaders)
+
 	cp := &containerPump{
 		container:  container,
 		logstreams: make(map[chan *Message]*Route),
 	}
-	pump := func(source string, input io.Reader) {
+	pump := func(source string, hasHeaders bool, input io.Reader) {
 		buf := bufio.NewReader(input)
 		for {
+			// Discard header bytes from log message if TTY is false and api > 1.13.
+			if hasHeaders {
+				buf.Discard(8)
+			}
 			line, err := buf.ReadString('\n')
 			if err != nil {
 				if err != io.EOF {
@@ -362,8 +385,8 @@ func newContainerPump(container *docker.Container, stdout, stderr io.Reader) *co
 			})
 		}
 	}
-	go pump("stdout", stdout)
-	go pump("stderr", stderr)
+	go pump("stdout", hasHeaders, stdout)
+	go pump("stderr", hasHeaders, stderr)
 	return cp
 }
 

router/pump.go

@@ -127,11 +127,18 @@ func TestPumpContainerRename(t *testing.T) {
 		pumps:  make(map[string]*containerPump),
 		routes: make(map[chan *update]struct{}),
 	}
+	config := &docker.Config{
+		Tty: false,
+	}
 	container = &docker.Container{
-		ID:   "8dfafdbc3a40",
-		Name: "foo",
+		ID:     "8dfafdbc3a40",
+		Name:   "foo",
+		Config: config,
+	}
+	version := &docker.Env{
+		"ApiVersion=1.33",
 	}
-	p.pumps["8dfafdbc3a40"] = newContainerPump(container, os.Stdout, os.Stderr)
+	p.pumps["8dfafdbc3a40"] = newContainerPump(container, version, os.Stdout, os.Stderr)
 	if name := p.pumps["8dfafdbc3a40"].container.Name; name != "foo" {
 		t.Errorf("containerPump should have name: 'foo' got name: '%s'", name)
 	}
@@ -142,21 +149,35 @@ func TestPumpContainerRename(t *testing.T) {
 }
 
 func TestPumpNewContainerPump(t *testing.T) {
+	config := &docker.Config{
+		Tty: false,
+	}
 	container := &docker.Container{
-		ID: "8dfafdbc3a40",
+		ID:     "8dfafdbc3a40",
+		Config: config,
 	}
-	pump := newContainerPump(container, os.Stdout, os.Stderr)
+	version := &docker.Env{
+		"ApiVersion=1.33",
+	}
+	pump := newContainerPump(container, version, os.Stdout, os.Stderr)
 	if pump == nil {
 		t.Error("pump nil")
 		return
 	}
 }
 
 func TestPumpContainerPump(t *testing.T) {
+	config := &docker.Config{
+		Tty: true,
+	}
 	container := &docker.Container{
-		ID: "8dfafdbc3a40",
+		ID:     "8dfafdbc3a40",
+		Config: config,
+	}
+	version := &docker.Env{
+		"ApiVersion=1.33",
 	}
-	pump := newContainerPump(container, os.Stdout, os.Stderr)
+	pump := newContainerPump(container, version, os.Stdout, os.Stderr)
 	logstream, route := make(chan *Message), &Route{}
 	go func() {
 		for msg := range logstream {