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.

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

Fix service logs API to be able to specify stream #31313

Merged
merged 1 commit into from Feb 24, 2017

Conversation

Projects
None yet
6 participants
@dperny
Contributor

dperny commented Feb 23, 2017

Fixes #31306

- What I did
Fixed a bug in the API where the user's choice of log streams was being ignored, #31306

- How I did it
Added a check and changed the API call to swarmkit to include the user's desires.

- How to verify it

curl wth various permutations of stdout and stderr /v1.27/services/{serviceid}/logs?stdout=true&stderr=false. Note you only get back the requested logs.

- Description for the changelog
Fix service logs API to bea ble to specify stream.

- A picture of a cute animal (not mandatory but encouraged)
my girlfriend saw these puppies for sale on the tuscaloosa, alabama buy and sell group.
image

Fix service logs API to be able to specify stream
Before this change, doing service logs was just tossing the stream
selectors and always using the default (both streams). This change adds
a check for which streams the user wants and only includes those.

Fixes #31306

Signed-off-by: Drew Erny <drew.erny@docker.com>
@dperny

This comment has been minimized.

Show comment
Hide comment
@dperny

dperny Feb 23, 2017

Contributor

@aluzzardi I'm not missing something, right? Didn't seem to me like there was any good reason that this was left un-wired.

Contributor

dperny commented Feb 23, 2017

@aluzzardi I'm not missing something, right? Didn't seem to me like there was any good reason that this was left un-wired.

@tonistiigi

This comment has been minimized.

Show comment
Hide comment
@tonistiigi

tonistiigi Feb 23, 2017

Member

LGTM

Member

tonistiigi commented Feb 23, 2017

LGTM

@aaronlehmann

This comment has been minimized.

Show comment
Hide comment
@aaronlehmann

aaronlehmann Feb 23, 2017

Contributor

Should we add corresponding CLI flags?

Contributor

aaronlehmann commented Feb 23, 2017

Should we add corresponding CLI flags?

@thaJeztah

LGTM

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Feb 24, 2017

Member

@aaronlehmann we don't have those currently for docker logs, and redirecting 2> /dev/null works as well for now I guess

Member

thaJeztah commented Feb 24, 2017

@aaronlehmann we don't have those currently for docker logs, and redirecting 2> /dev/null works as well for now I guess

@dperny

This comment has been minimized.

Show comment
Hide comment
@dperny

dperny Feb 24, 2017

Contributor

In addition, I believe adding CLI flags is a separate discussion altogether.

Contributor

dperny commented Feb 24, 2017

In addition, I believe adding CLI flags is a separate discussion altogether.

@cpuguy83 cpuguy83 merged commit dd4a6c5 into moby:master Feb 24, 2017

4 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 31094 has succeeded
Details
janky Jenkins build Docker-PRs 39708 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 10773 has succeeded
Details

@GordonTheTurtle GordonTheTurtle added this to the 17.04.0 milestone Feb 24, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment