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

Nomad logs command to stream task logs #1444

Merged
merged 16 commits into from
Jul 25, 2016
Merged

Nomad logs command to stream task logs #1444

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cc0fec5
initial log api impl
dadgar Jul 18, 2016
2530f7b
initial api and command
dadgar Jul 18, 2016
065cf09
tests
dadgar Jul 19, 2016
53f1989
Fix buffer reuse
dadgar Jul 19, 2016
4cf65d7
Read from correct offset
dadgar Jul 19, 2016
ac1cfd1
unblock the readers to add liveness when using -n
dadgar Jul 20, 2016
8cb4f76
remove file events and last offset
dadgar Jul 20, 2016
efc4700
fix indents
dadgar Jul 20, 2016
fff91cf
Look up the tasks automatically
dadgar Jul 20, 2016
b65fd26
Support non-following logs
dadgar Jul 20, 2016
f22e228
log tests
dadgar Jul 20, 2016
f3a71e0
Handle skipping indexes
dadgar Jul 20, 2016
2a32e83
Add logs command test
dadgar Jul 20, 2016
cbcb320
small fixes
dadgar Jul 22, 2016
67fe934
control-c works
dadgar Jul 22, 2016
0b9449f
better flush and connection closed handling
dadgar Jul 22, 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
Prev Previous commit
Next Next commit
small fixes
  • Loading branch information
@dadgar
dadgar committed Jul 25, 2016
commit cbcb32096fb0321a29b6c03ef81c255389ec7a6e
12 changes: 10 additions & 2 deletions command/agent/fs_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,9 +546,17 @@ func (s *HTTPServer) Stream(resp http.ResponseWriter, req *http.Request) (interf
framer.Run()
defer framer.Destroy()

return nil, s.stream(offset, path, fs, framer, nil)
err := s.stream(offset, path, fs, framer, nil)
if err != nil && err != syscall.EPIPE {
return nil, err
}

return nil, nil
}

// stream is the internal method to stream the content of a file. eofCancelCh is
// used to cancel the stream if triggered while at EOF. If the connection is
// broken an EPIPE error is returned
func (s *HTTPServer) stream(offset int64, path string,
fs allocdir.AllocDirFS, framer *StreamFramer,
eofCancelCh chan error) error {
Expand Down Expand Up @@ -805,7 +813,7 @@ func (s *HTTPServer) logs(follow bool, offset int64,
}

// Check if the connection was closed
if err == syscall.EPIPE {
if strings.Contains(err.Error(), syscall.EPIPE.Error()) {
return nil
}

Expand Down