Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Now using event timestamp to retrieve relevant logs. #209

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Now using event timestamp to retrieve relevant logs. #209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
357e669
Now using event timestamp to retrieve relevant logs.
mattatcha Jun 25, 2016
b8dd210
ignore containers with unsupported log drivers
pmbauer Jul 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 15 additions & 53 deletions router/pump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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":
Expand All @@ -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")
Expand All @@ -158,62 +158,24 @@ func (p *LogsPump) pumpLogs(event *docker.APIEvents, backlog bool) {
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)
}
}()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This kills the work done to fix the fact that we previously didn't reconnect, as mentioned here: #191

}
Expand Down