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.

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

godeps: bump coreos/pkg/capnslog #3829

Merged
merged 1 commit into from
Nov 6, 2015
Merged

Conversation

jonboulle
Copy link
Contributor

Update to catch coreos/pkg#43 which should fix SYSLOG_IDENTIFIER getting
set when etcd is logging to the journal.

Before:

; journalctl -t etcd
-- No entries --

After:

; journalctl -t etcd
-- Logs begin at Mon 2014-08-11 02:58:28 CEST, end at Fri 2015-11-06 18:45:34 CET. --
Nov 06 18:45:33 trevize etcd[14200]: etcd Version: 2.3.0-alpha.0+git
Nov 06 18:45:33 trevize etcd[14200]: Git SHA: 6f8356ba405c
Nov 06 18:45:33 trevize etcd[14200]: Go Version: go1.5.1
Nov 06 18:45:33 trevize etcd[14200]: Go OS/Arch: linux/amd64
Nov 06 18:45:33 trevize etcd[14200]: setting maximum number of CPUs to 4, total number of available CPUs is 4
Nov 06 18:45:33 trevize etcd[14200]: no data-dir provided, using default data-dir ./default.etcd
Nov 06 18:45:33 trevize etcd[14200]: the server is already initialized as member before, starting as etcd member...
Nov 06 18:45:33 trevize etcd[14200]: listening for peers on http://localhost:2380
Nov 06 18:45:33 trevize etcd[14200]: listening for peers on http://localhost:7001
Nov 06 18:45:33 trevize etcd[14200]: listening for client requests on http://localhost:2379
Nov 06 18:45:33 trevize etcd[14200]: listening for client requests on http://localhost:4001

Fixes #3828

Update to catch coreos/pkg#43 which should fix SYSLOG_IDENTIFIER getting
set when etcd is logging to the journal.
@yichengq
Copy link
Contributor

yichengq commented Nov 6, 2015

awesome. LGTM. This deserves to be backport IMO.

jonboulle added a commit that referenced this pull request Nov 6, 2015
godeps: bump coreos/pkg/capnslog
@jonboulle jonboulle merged commit 3de5d47 into etcd-io:master Nov 6, 2015
@jonboulle
Copy link
Contributor Author

@yichengq to which?

@yichengq
Copy link
Contributor

yichengq commented Nov 6, 2015

To release-2.2. For now, adding 'kind/backport' is good enough.

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

Successfully merging this pull request may close these issues.

etcd v2.2.1 and journald 225 doesn't recognize log tag
3 participants