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.

Sign up for GitHub

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

Jump to bottom

*: fix capnslog journal writer with zap logger #9729

Merged
merged 6 commits into from
May 16, 2018
Merged

*: fix capnslog journal writer with zap logger #9729

merged 6 commits into from
May 16, 2018

Commits on May 16, 2018

  1. pkg/logutil: error when it can't find journal socket 

    Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
    @gyuho
    gyuho committed May 16, 2018
    Configuration menu
    Copy the full SHA
    1e953bd View commit details
    Browse the repository at this point in the history

  2. embed: error when it cannot find journal socket 

    Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
    @gyuho
    gyuho committed May 16, 2018
    Configuration menu
    Copy the full SHA
    5a61dc8 View commit details
    Browse the repository at this point in the history

  3. *: rename to "journal" 

    Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
    @gyuho
    gyuho committed May 16, 2018
    Configuration menu
    Copy the full SHA
    3a80499 View commit details
    Browse the repository at this point in the history

  4. embed: do not support "--log-outputs=default" for zap logger 

    systemd/journal should be configured manually.
Interpreting PPID 1 as systemd unit is wrong,
especially when embedded etcd runs under Docker
container. For such case, every single log write
will error and fall back to stderr, which is
inefficient.

Instead, add "systemd/journal" log output option
and returns error if systemd/journal socket cannot
be found.

"--logger=zap --log-outputs=default" will only error
for v3.4, since zap logger is still experimental.

v3.5 deprecates capnslog and changes "--log-outputs"
default value to "--log-outputs=stderr".

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
    @gyuho
    gyuho committed May 16, 2018
    Configuration menu
    Copy the full SHA
    15fcd6d View commit details
    Browse the repository at this point in the history

  5. CHANGELOG: discontinue "--log-outputs=default" support for zap logger 

    Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
    @gyuho
    gyuho committed May 16, 2018
    Configuration menu
    Copy the full SHA
    258d720 View commit details
    Browse the repository at this point in the history

  6. integration: remove unnecessary blank line 

    Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
    @gyuho
    gyuho committed May 16, 2018
    Configuration menu
    Copy the full SHA
    265a37f View commit details
    Browse the repository at this point in the history