Add support for details on service logs#42
Merged
Conversation
dnephin
reviewed
May 8, 2017
| // string is not in a valid format | ||
| // the exact form of details encoding is implemented in | ||
| // api/server/httputils/write_log_stream.go | ||
| func ParseLogDetails(details string) (map[string]string, error) { |
Contributor
Author
There was a problem hiding this comment.
Actually this is in the wrong place
dperny
force-pushed
the
service-logs-support-details
branch
6 times, most recently
from
b22ea84 to
7230906
Compare
Contributor
Author
|
includes #45 because i need tests on docker to pass and they won't without this |
Contributor
Author
|
please ping me directly on slack when you're reviewing this. |
dperny
force-pushed
the
service-logs-support-details
branch
2 times, most recently
from
66a2871 to
131f9be
Compare
Contributor
Author
|
rebased onto master. vendored moby at the dependent commit. |
thaJeztah
requested changes
May 16, 2017
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
had a quick glance; left two comments
| // options specific to service logs | ||
| flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names in output") | ||
| flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output") | ||
| flags.BoolVar(&opts.raw, "raw", false, "Do not neatly format logs") |
Member
There was a problem hiding this comment.
can you add an API version annotation here?
flags.SetAnnotation("raw", "version", []string{"1.30"})| flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output") | ||
| flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37) or relative (e.g. 42m for 42 minutes)") | ||
| flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps") | ||
| flags.BoolVar(&opts.details, "details", false, "Show extra details provided to logs") |
Member
There was a problem hiding this comment.
can you add an API version annotation here?
flags.SetAnnotation("details", "version", []string{"1.30"})
dperny
force-pushed
the
service-logs-support-details
branch
from
131f9be to
3043122
Compare
Contributor
Author
|
@thaJeztah fixed. |
dnephin
reviewed
May 16, 2017
| } else { | ||
| output = append(output, part...) | ||
| // then sort em | ||
| sort.Strings(detailKeys) |
Contributor
There was a problem hiding this comment.
I don't think you need this. I'm pretty sure you can just sort the d slice.
Contributor
Author
There was a problem hiding this comment.
yeah, i think you're right. this is hold-over code from when i was caching the details keys.
dperny
force-pushed
the
service-logs-support-details
branch
from
3043122 to
93240c2
Compare
Contributor
Author
|
@dnephin fixed. |
|
Needs a rebase |
dperny
force-pushed
the
service-logs-support-details
branch
from
93240c2 to
9025f7f
Compare
Contributor
Author
|
took the wrong vendor commit on rebase, i force-pushed change but i think gh is broken right now. this should fix it, though. |
Adds CLI and client support for details on service logs. CLI component of moby/moby#32996. Signed-off-by: Drew Erny <drew.erny@docker.com>
dperny
force-pushed
the
service-logs-support-details
branch
from
a96dd33 to
ebc0eff
Compare
nobiit
pushed a commit
to nobidev/docker-cli
that referenced
this pull request
Nov 19, 2025
Remove unneeded line in 17.06 CHANGELOG
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds CLI and client support for details on service logs. CLI component of moby/moby#32996.