Skip to content

Commit

Permalink
Make vendored logrus library reflect vendor.json
Browse files Browse the repository at this point in the history
I ran `govendor status` to check the integrity of vendored packages and
found that the vendored copy of the logrus library did not match the
version pinned in `vendor.json`.

govendor gave the following error:

    $ govendor status
    The following packages are missing or modified locally:
            github.com/Sirupsen/logrus
    Error: status failed for 1 package(s)

Additionally, remove the unused lowercase variant of logrus from
`vendor.json`. The URL for this library changed upstream to use
lowercase `sirupsen` instead of `Sirupsen`. The best way forward for now
is to continue to use the uppercase version as that's what's used by the
Prometheus libraries; mixed-case imports result in an import collision:

    can't load package: package github.com/sirupsen/logrus: case-insensitive import collision: "github.com/Sirupsen/logrus" and "github.com/sirupsen/logrus"

See this comment for more details:
sirupsen/logrus#570 (comment)
  • Loading branch information
mattbostock committed Jul 23, 2017
1 parent e047551 commit c31b012
Show file tree
Hide file tree
Showing 16 changed files with 153 additions and 417 deletions.
43 changes: 0 additions & 43 deletions vendor/github.com/Sirupsen/logrus/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

178 changes: 47 additions & 131 deletions vendor/github.com/Sirupsen/logrus/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/github.com/Sirupsen/logrus/alt_exit.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/Sirupsen/logrus/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 18 additions & 19 deletions vendor/github.com/Sirupsen/logrus/entry.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/Sirupsen/logrus/exported.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 4 additions & 37 deletions vendor/github.com/Sirupsen/logrus/json_formatter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c31b012

Please sign in to comment.