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

Service logs formatting #31672

Merged
merged 2 commits into from Mar 13, 2017

Conversation

Projects
None yet
6 participants
@dperny
Contributor

dperny commented Mar 9, 2017

This PR updates #29197 to address the concerns with that PR.

  • Removed the --details flag which isn't supported in the swarmkit API at this time. It may return later.
  • Fixed a possible issue with setting the padding variable on recommendation of @aaronlehmann.
  • Declined to implement a go template formatter. It's a lot of work and too much control; it may return later.
  • Changed no-ids to no-task-ids

Does this look good @aaronlehmann @cpuguy83 @vdemeester ?
/cc @aluzzardi

service logs: Improve formatting
- Align output. Previously, output would end up unaligned because of
longer task names (e.g. web.1 vs web.10)
- Truncate task IDs and add a --no-trunc option
- Added a --no-ids option to remove IDs altogether
- Got rid of the generic ID Resolver as we need more customization.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Fixed concerns, updated, and rebased PR.
Signed-off-by: Drew Erny <drew.erny@docker.com>
@dperny

This comment has been minimized.

Show comment
Hide comment
@dperny

dperny Mar 9, 2017

Contributor

This PR supersedes #29197 and that PR can be closed.

Contributor

dperny commented Mar 9, 2017

This PR supersedes #29197 and that PR can be closed.

@dperny dperny referenced this pull request Mar 9, 2017

Closed

Make Docker Service Logs GA #31399

7 of 12 tasks complete
@dperny

This comment has been minimized.

Show comment
Hide comment
@dperny

dperny Mar 10, 2017

Contributor

I don't believe the test failure is my fault.

Contributor

dperny commented Mar 10, 2017

I don't believe the test failure is my fault.

@aluzzardi aluzzardi added this to the 17.04.0 milestone Mar 10, 2017

@aluzzardi

This comment has been minimized.

Show comment
Hide comment
@aluzzardi

aluzzardi Mar 10, 2017

Member

Tentatively targeting 17.04.0

Member

aluzzardi commented Mar 10, 2017

Tentatively targeting 17.04.0

@vdemeester

LGTM 🦁
Experimental failure is a flaky test yeah 😓

@aluzzardi

This comment has been minimized.

Show comment
Hide comment
@aluzzardi

aluzzardi Mar 10, 2017

Member

@cpuguy83 any feedback?

Member

aluzzardi commented Mar 10, 2017

@cpuguy83 any feedback?

@aluzzardi

This comment has been minimized.

Show comment
Hide comment
@aluzzardi

aluzzardi Mar 10, 2017

Member

LGTM

Member

aluzzardi commented Mar 10, 2017

LGTM

@cpuguy83

LGTM

@cpuguy83

This comment has been minimized.

Show comment
Hide comment
@cpuguy83

cpuguy83 Mar 13, 2017

Contributor

Damnit, hit the wrong button, no confirmations or anything...
@dperny You can just remove the last commit.

Contributor

cpuguy83 commented Mar 13, 2017

Damnit, hit the wrong button, no confirmations or anything...
@dperny You can just remove the last commit.

@GordonTheTurtle GordonTheTurtle removed the dco/no label Mar 13, 2017

@cpuguy83

This comment has been minimized.

Show comment
Hide comment
@cpuguy83

cpuguy83 Mar 13, 2017

Contributor

Ok, I fixed it.

Contributor

cpuguy83 commented Mar 13, 2017

Ok, I fixed it.

@cpuguy83 cpuguy83 merged commit aa733ba into moby:master Mar 13, 2017

1 of 6 checks passed

experimental Jenkins build Docker-PRs-experimental 31670 is running
Details
janky Jenkins build Docker-PRs 40293 is running
Details
powerpc Jenkins build is being scheduled
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 11373 is running
Details
z Jenkins build is being scheduled
Details
dco-signed All commits are signed

dnephin pushed a commit to dnephin/docker that referenced this pull request Apr 17, 2017

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