From 357e669bbc69e8f20bc2dfdc8dadafa474c8ca35 Mon Sep 17 00:00:00 2001
From: Matt Aitchison <Matt@lanciv.com>
Date: Sat, 25 Jun 2016 17:14:12 -0500
Subject: [PATCH 1/2] Now using event timestamp to retrieve relevant logs.

---
 router/pump.go | 72 +++++++++++---------------------------------------
 1 file changed, 15 insertions(+), 57 deletions(-)

diff --git a/router/pump.go b/router/pump.go
index 9f50ac20..fcbcd5a5 100644
--- a/router/pump.go
+++ b/router/pump.go
@@ -120,7 +120,7 @@ func (p *LogsPump) Run() error {
 		p.pumpLogs(&docker.APIEvents{
 			ID:     normalID(listing.ID),
 			Status: "start",
-		}, false)
+		})
 	}
 	events := make(chan *docker.APIEvents)
 	err = p.client.AddEventListener(events)
@@ -131,7 +131,7 @@ func (p *LogsPump) Run() error {
 		debug("pump.Run() event:", normalID(event.ID), event.Status)
 		switch event.Status {
 		case "start", "restart":
-			go p.pumpLogs(event, true)
+			go p.pumpLogs(event)
 		case "rename":
 			go p.rename(event)
 		case "die":
@@ -141,7 +141,7 @@ func (p *LogsPump) Run() error {
 	return errors.New("docker event stream closed")
 }
 
-func (p *LogsPump) pumpLogs(event *docker.APIEvents, backlog bool) {
+func (p *LogsPump) pumpLogs(event *docker.APIEvents) {
 	id := normalID(event.ID)
 	container, err := p.client.InspectContainer(id)
 	assert(err, "pump")
@@ -153,67 +153,25 @@ func (p *LogsPump) pumpLogs(event *docker.APIEvents, backlog bool) {
 		debug("pump.pumpLogs():", id, "ignored: environ ignore")
 		return
 	}
-	if !logDriverSupported(container) {
-		debug("pump.pumpLogs():", id, "ignored: log driver not supported")
-		return
-	}
 
-	var sinceTime time.Time
-	if backlog {
-		sinceTime = time.Unix(0, 0)
-	} else {
-		sinceTime = time.Now()
-	}
-
-	p.mu.Lock()
-	if _, exists := p.pumps[id]; exists {
-		p.mu.Unlock()
-		debug("pump.pumpLogs():", id, "pump exists")
-		return
-	}
 	outrd, outwr := io.Pipe()
 	errrd, errwr := io.Pipe()
 	p.pumps[id] = newContainerPump(container, outrd, errrd)
 	p.mu.Unlock()
 	p.update(event)
 	go func() {
-		for {
-			debug("pump.pumpLogs():", id, "started")
-			err := p.client.Logs(docker.LogsOptions{
-				Container:    id,
-				OutputStream: outwr,
-				ErrorStream:  errwr,
-				Stdout:       true,
-				Stderr:       true,
-				Follow:       true,
-				Tail:         "all",
-				Since:        sinceTime.Unix(),
-			})
-			if err != nil {
-				debug("pump.pumpLogs():", id, "stopped with error:", err)
-			} else {
-				debug("pump.pumpLogs():", id, "stopped")
-			}
-
-			sinceTime = time.Now()
-
-			container, err := p.client.InspectContainer(id)
-			if err != nil {
-				_, four04 := err.(*docker.NoSuchContainer)
-				if !four04 {
-					assert(err, "pump")
-				}
-			} else if container.State.Running {
-				continue
-			}
-
-			debug("pump.pumpLogs():", id, "dead")
-			outwr.Close()
-			errwr.Close()
-			p.mu.Lock()
-			delete(p.pumps, id)
-			p.mu.Unlock()
-			return
+		err := p.client.Logs(docker.LogsOptions{
+			Container:    id,
+			OutputStream: outwr,
+			ErrorStream:  errwr,
+			Stdout:       true,
+			Stderr:       true,
+			Follow:       true,
+			Tail:         "all",
+			Since:        event.Time,
+		})
+		if err != nil {
+			debug("pump.pumpLogs():", id, "stopped:", err)
 		}
 	}()
 }

From b8dd210f8947463237a5c190c7edfb6568e3df43 Mon Sep 17 00:00:00 2001
From: Paul M Bauer <paul@bauer.codes>
Date: Fri, 1 Jul 2016 08:22:56 -0700
Subject: [PATCH 2/2] ignore containers with unsupported log drivers

trying to hit /logs for a container that does not support that endpoint
results in the following error in that container's stdout

"Error running logs job: configured logging reader does not support
reading"
---
 router/pump.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/router/pump.go b/router/pump.go
index fcbcd5a5..759d9a0c 100644
--- a/router/pump.go
+++ b/router/pump.go
@@ -153,6 +153,10 @@ func (p *LogsPump) pumpLogs(event *docker.APIEvents) {
 		debug("pump.pumpLogs():", id, "ignored: environ ignore")
 		return
 	}
+	if !logDriverSupported(container) {
+		debug("pump.pumpLogs():", id, "ignored: log driver not supported")
+		return
+	}
 
 	outrd, outwr := io.Pipe()
 	errrd, errwr := io.Pipe()