Skip to content

vendor: sirupsen/logrus v1.6.0#40873

Merged
AkihiroSuda merged 1 commit intomoby:masterfrom
thaJeztah:bump_logrus
May 4, 2020
Merged

vendor: sirupsen/logrus v1.6.0#40873
AkihiroSuda merged 1 commit intomoby:masterfrom
thaJeztah:bump_logrus

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 29, 2020 •
edited
Loading

full diff: sirupsen/logrus@v1.4.2...v1.6.0

  • Ability to DisableHTMLEscape when using the JSON formatter
  • Support/fixes for go 1.14
  • Many many bugfixes
  • Add flag to disable quotes in TextFormatter

relates to #40353

@thaJeztah thaJeztah mentioned this pull request Apr 29, 2020
Merged
20 tasks
thaJeztah
thaJeztah commented Apr 29, 2020
View reviewed changes
vendor/github.com/sirupsen/logrus/README.md Outdated
Copy link
Member Author

@thaJeztah thaJeztah Apr 29, 2020

Choose a reason for hiding this comment

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

FYI: Highlighting this one (sirupsen/logrus@4ecd9a6)

@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 29, 2020

Interesting; why is vendor-check failing?


[2020-04-29T10:42:27.603Z] 2020/04/29 10:42:27 Running time: 59.319080776s
[2020-04-29T10:42:27.603Z] The result of vndr differs
[2020-04-29T10:42:27.603Z] 
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/LICENSE
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/NOTICE
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/README.md
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/activation/files.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/activation/listeners.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/activation/packetconns.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/daemon/sdnotify.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/daemon/watchdog.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/dbus.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/methods.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/properties.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/set.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/subscription.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/subscription_set.go
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/go.mod
[2020-04-29T10:42:27.603Z]  D vendor/github.com/coreos/go-systemd/v22/journal/journal.go
[2020-04-29T10:42:27.603Z] 
[2020-04-29T10:42:27.603Z] Please vendor your package with github.com/LK4D4/vndr.

@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 29, 2020

Oooh, looks like it's getting confused because we both have coreos/go-systemd and coreos/go-systemd/v22 as depenency;


[2020-04-29T10:42:21.063Z] 2020/04/29 10:42:18 Collecting all dependencies
[2020-04-29T10:42:27.603Z] 2020/04/29 10:42:26 Clean vendor dir from unused packages
[2020-04-29T10:42:27.603Z] 2020/04/29 10:42:27 WARNING: package github.com/coreos/go-systemd/v22 is unused, consider removing it from vendor.conf
[2020-04-29T10:42:27.603Z] 2020/04/29 10:42:27 Success

If you vendor the one without /v22, it removes the one with /v22, so order is important there (although I'm not sure if that's the cause)

@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 29, 2020

Trying a full vendor locally gives me;

020/04/29 13:58:56 	Clone github.com/coreos/go-systemd, revision 39ca1b05acc7ad1220e09f133283b8859a8b71ab, attempt 1/20
2020/04/29 13:58:57 	Clone github.com/coreos/go-systemd/v22, attempt 1/20 finished with error github.com/coreos/go-systemd/v22: Err: exit status 128, out: Cloning into '/go/src/github.com/docker/docker/vendor/github.com/coreos/go-systemd/v22'...
error: unable to write sha1 filename /go/src/github.com/docker/docker/vendor/github.com/coreos/go-systemd/v22/.git/objects/pack/pack-eb632d08067a3c125eb100e51e07dd28a91af972.idx: No such file or directory
fatal: cannot store index file
fatal: index-pack failed
2020/04/29 13:58:58 	Clone github.com/coreos/go-systemd/v22, revision 2d78030078ef61b3cae27f42ad6d0e46db51b339, attempt 2/20

So looks like it may be a race condition

cpuguy83
cpuguy83 approved these changes Apr 29, 2020
View reviewed changes
Copy link
Member

@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

@cpuguy83
Copy link
Member

cpuguy83 commented Apr 29, 2020

Outside of vendoring issues, of course.

@thaJeztah thaJeztah mentioned this pull request Apr 29, 2020
Merged
@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 29, 2020

Just pushed a PR to swap the order of the dependencies (#40875), and rebased this one to include that change (to verify)

I'll open a PR in vndr to sort in the vndr code

@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 29, 2020

PR in vndr is also up; LK4D4/vndr#91

@thaJeztah
Copy link
Member Author

thaJeztah commented May 2, 2020

They just released v1.6.0, which fixes some regressions in v1.5.0; let me update this PR

@thaJeztah
vendor: sirupsen/logrus v1.6.0
e1e544c 
full diff: sirupsen/logrus@v1.4.2...v1.6.0

- Ability to DisableHTMLEscape when using the JSON formatter
- Support/fixes for go 1.14
- Many many bugfixes
- Add flag to disable quotes in TextFormatter

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title vendor: sirupsen/logrus v1.5.0 vendor: sirupsen/logrus v1.6.0 May 2, 2020
@thaJeztah
Copy link
Member Author

thaJeztah commented May 2, 2020

Updated to v1.6.0

cpuguy83
cpuguy83 approved these changes May 3, 2020
View reviewed changes
Copy link
Member

@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

@AkihiroSuda AkihiroSuda merged commit 0a5cec2 into moby:master May 4, 2020
@thaJeztah thaJeztah deleted the bump_logrus branch May 4, 2020 14:02
@thaJeztah thaJeztah added this to the 20.03.0 milestone May 6, 2020
@thaJeztah thaJeztah mentioned this pull request Jan 14, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

process/cherry-picked status/2-code-review

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @cpuguy83 @AkihiroSuda