Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs/go-log
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.7
Choose a base ref
...
head repository: ipfs/go-log
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.8
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on May 12, 2020

  1. update contributing link

    @stensonb
    stensonb authored May 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4292da3 View commit details

  2. Merge pull request #84 from stensonb/patch-1 

    update contributing link
    @Stebalien
    Stebalien authored May 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f1add01 View commit details

  3. fix: correctly add the skip option to Warningf 

    This time I've actually tested this as best I can (without, you know, adding
actual unit tests).

fixes #85
    @Stebalien
    Stebalien committed May 12, 2020
    Copy the full SHA
    42cabfc View commit details

Commits on May 13, 2020

  1. Merge pull request #86 from ipfs/fix/85 

    fix: correctly add the skip option to Warningf
    @Stebalien
    Stebalien authored May 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc39b17 View commit details
Showing with 4 additions and 5 deletions.
  1. +1 −1 README.md
  2. +3 −4 log.go
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/c

### Want to hack on IPFS?

[![](https://cdn.rawgit.com/jbenet/contribute-ipfs-gif/master/img/contribute.gif)](https://github.com/ipfs/community/blob/master/contributing.md)
[![](https://cdn.rawgit.com/jbenet/contribute-ipfs-gif/master/img/contribute.gif)](https://github.com/ipfs/community/blob/master/CONTRIBUTING.md)

## License

7 changes: 3 additions & 4 deletions log.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Package log is the logging library used by IPFS
// (https://github.com/ipfs/go-ipfs). It uses a modified version of
// https://godoc.org/github.com/whyrusleeping/go-logging .
// Package log is the logging library used by IPFS & libp2p
// (https://github.com/ipfs/go-ipfs).
package log

import (
@@ -41,7 +40,7 @@ func Logger(system string) *ZapEventLogger {
}

logger := getLogger(system)
skipLogger := logger.With(zap.AddCallerSkip(1))
skipLogger := logger.Desugar().WithOptions(zap.AddCallerSkip(1)).Sugar()

return &ZapEventLogger{
system: system,