Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[17.06] Fix stderr logging for journald and syslog #95

Merged
merged 1 commit into from
Jul 12, 2017
Merged

[17.06] Fix stderr logging for journald and syslog #95

merged 1 commit into from
Jul 12, 2017

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jul 4, 2017

Backport fix:

With cherry-pick moby/moby@917050c:

$ git cherry-pick -s -x -Xsubtree=components/engine 917050c

No conflicts.

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

ping @tiborvass @cpuguy83

Copy link
Contributor

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

logger.PutMessage, added in #28762 (v17.04.0-ce), clears msg.Source. So journald
and syslog were treating stderr messages as if they were stdout.

Signed-off-by: David Glasser <glasser@davidglasser.net>
(cherry picked from commit 917050c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
@andrewhsu andrewhsu merged commit 2d8beb7 into docker-archive:17.06 Jul 12, 2017
@andrewhsu andrewhsu deleted the fix-logging branch July 12, 2017 21:40
docker-jenkins pushed a commit that referenced this pull request Mar 21, 2018
Don't append number when doing a dev build
Upstream-commit: 468d37e
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Oct 25, 2018
[18.09] Add note that we use the bump_v18.09 branch for SwarmKit
Upstream-commit: 78746ca9e8cc46304509866ab34851f56b4a7edb
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Don't append number when doing a dev build
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] Fix stderr logging for journald and syslog
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants