summaryrefslogtreecommitdiff
path: root/vendor/github.com/sirupsen/logrus
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-12 12:15:27 -0500
committerGitHub <noreply@github.com>2021-03-12 12:15:27 -0500
commitfc02d16e728dfdd5a5f2e3bc622bbceb7f8c0d24 (patch)
treeea1036f8e3e8b2263df5383a1c017928e2f494ff /vendor/github.com/sirupsen/logrus
parent605df430d90029b9b7b430c78691425410544509 (diff)
parent12fb9e46538621ed494f692085e3c567822262da (diff)
downloadpodman-fc02d16e728dfdd5a5f2e3bc622bbceb7f8c0d24.tar.gz
podman-fc02d16e728dfdd5a5f2e3bc622bbceb7f8c0d24.tar.bz2
podman-fc02d16e728dfdd5a5f2e3bc622bbceb7f8c0d24.zip
Merge pull request #9684 from containers/dependabot/go_modules/github.com/sirupsen/logrus-1.8.1
Bump github.com/sirupsen/logrus from 1.8.0 to 1.8.1
Diffstat (limited to 'vendor/github.com/sirupsen/logrus')
-rw-r--r--vendor/github.com/sirupsen/logrus/.travis.yml7
-rw-r--r--vendor/github.com/sirupsen/logrus/CHANGELOG.md9
-rw-r--r--vendor/github.com/sirupsen/logrus/entry.go10
-rw-r--r--vendor/github.com/sirupsen/logrus/go.mod1
-rw-r--r--vendor/github.com/sirupsen/logrus/go.sum4
-rw-r--r--vendor/github.com/sirupsen/logrus/json_formatter.go3
-rw-r--r--vendor/github.com/sirupsen/logrus/magefile.go77
-rw-r--r--vendor/github.com/sirupsen/logrus/text_formatter.go5
8 files changed, 29 insertions, 87 deletions
diff --git a/vendor/github.com/sirupsen/logrus/.travis.yml b/vendor/github.com/sirupsen/logrus/.travis.yml
index e6ee8b3ab..c1dbd5a3a 100644
--- a/vendor/github.com/sirupsen/logrus/.travis.yml
+++ b/vendor/github.com/sirupsen/logrus/.travis.yml
@@ -9,6 +9,7 @@ os: linux
install:
- ./travis/install.sh
script:
- - go run mage.go -v crossBuild
- - go run mage.go lint
- - go run mage.go test
+ - cd ci
+ - go run mage.go -v -w ../ crossBuild
+ - go run mage.go -v -w ../ lint
+ - go run mage.go -v -w ../ test
diff --git a/vendor/github.com/sirupsen/logrus/CHANGELOG.md b/vendor/github.com/sirupsen/logrus/CHANGELOG.md
index 311f2c339..7567f6128 100644
--- a/vendor/github.com/sirupsen/logrus/CHANGELOG.md
+++ b/vendor/github.com/sirupsen/logrus/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.8.1
+Code quality:
+ * move magefile in its own subdir/submodule to remove magefile dependency on logrus consumer
+ * improve timestamp format documentation
+
+Fixes:
+ * fix race condition on logger hooks
+
+
# 1.8.0
Correct versioning number replacing v1.7.1.
diff --git a/vendor/github.com/sirupsen/logrus/entry.go b/vendor/github.com/sirupsen/logrus/entry.go
index c968f6344..07a1e5fa7 100644
--- a/vendor/github.com/sirupsen/logrus/entry.go
+++ b/vendor/github.com/sirupsen/logrus/entry.go
@@ -261,7 +261,15 @@ func (entry *Entry) log(level Level, msg string) {
}
func (entry *Entry) fireHooks() {
- err := entry.Logger.Hooks.Fire(entry.Level, entry)
+ var tmpHooks LevelHooks
+ entry.Logger.mu.Lock()
+ tmpHooks = make(LevelHooks, len(entry.Logger.Hooks))
+ for k, v := range entry.Logger.Hooks {
+ tmpHooks[k] = v
+ }
+ entry.Logger.mu.Unlock()
+
+ err := tmpHooks.Fire(entry.Level, entry)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
}
diff --git a/vendor/github.com/sirupsen/logrus/go.mod b/vendor/github.com/sirupsen/logrus/go.mod
index 37004ff34..b3919d5ea 100644
--- a/vendor/github.com/sirupsen/logrus/go.mod
+++ b/vendor/github.com/sirupsen/logrus/go.mod
@@ -2,7 +2,6 @@ module github.com/sirupsen/logrus
require (
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/magefile/mage v1.10.0
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.2
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037
diff --git a/vendor/github.com/sirupsen/logrus/go.sum b/vendor/github.com/sirupsen/logrus/go.sum
index bce26a188..694c18b84 100644
--- a/vendor/github.com/sirupsen/logrus/go.sum
+++ b/vendor/github.com/sirupsen/logrus/go.sum
@@ -1,12 +1,8 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
-github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/vendor/github.com/sirupsen/logrus/json_formatter.go b/vendor/github.com/sirupsen/logrus/json_formatter.go
index afaf0fc8a..c96dc5636 100644
--- a/vendor/github.com/sirupsen/logrus/json_formatter.go
+++ b/vendor/github.com/sirupsen/logrus/json_formatter.go
@@ -23,6 +23,9 @@ func (f FieldMap) resolve(key fieldKey) string {
// JSONFormatter formats logs into parsable json
type JSONFormatter struct {
// TimestampFormat sets the format used for marshaling timestamps.
+ // The format to use is the same than for time.Format or time.Parse from the standard
+ // library.
+ // The standard Library already provides a set of predefined format.
TimestampFormat string
// DisableTimestamp allows disabling automatic timestamps in output
diff --git a/vendor/github.com/sirupsen/logrus/magefile.go b/vendor/github.com/sirupsen/logrus/magefile.go
deleted file mode 100644
index 9aa603939..000000000
--- a/vendor/github.com/sirupsen/logrus/magefile.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// +build mage
-
-package main
-
-import (
- "encoding/json"
- "fmt"
- "os"
- "path"
-
- "github.com/magefile/mage/mg"
- "github.com/magefile/mage/sh"
-)
-
-// getBuildMatrix returns the build matrix from the current version of the go compiler
-func getBuildMatrix() (map[string][]string, error) {
- jsonData, err := sh.Output("go", "tool", "dist", "list", "-json")
- if err != nil {
- return nil, err
- }
- var data []struct {
- Goos string
- Goarch string
- }
- if err := json.Unmarshal([]byte(jsonData), &data); err != nil {
- return nil, err
- }
-
- matrix := map[string][]string{}
- for _, v := range data {
- if val, ok := matrix[v.Goos]; ok {
- matrix[v.Goos] = append(val, v.Goarch)
- } else {
- matrix[v.Goos] = []string{v.Goarch}
- }
- }
-
- return matrix, nil
-}
-
-func CrossBuild() error {
- matrix, err := getBuildMatrix()
- if err != nil {
- return err
- }
-
- for os, arches := range matrix {
- for _, arch := range arches {
- env := map[string]string{
- "GOOS": os,
- "GOARCH": arch,
- }
- if mg.Verbose() {
- fmt.Printf("Building for GOOS=%s GOARCH=%s\n", os, arch)
- }
- if err := sh.RunWith(env, "go", "build", "./..."); err != nil {
- return err
- }
- }
- }
- return nil
-}
-
-func Lint() error {
- gopath := os.Getenv("GOPATH")
- if gopath == "" {
- return fmt.Errorf("cannot retrieve GOPATH")
- }
-
- return sh.Run(path.Join(gopath, "bin", "golangci-lint"), "run", "./...")
-}
-
-// Run the test suite
-func Test() error {
- return sh.RunWith(map[string]string{"GORACE": "halt_on_error=1"},
- "go", "test", "-race", "-v", "./...")
-}
diff --git a/vendor/github.com/sirupsen/logrus/text_formatter.go b/vendor/github.com/sirupsen/logrus/text_formatter.go
index 8fc698ad6..be2c6efe5 100644
--- a/vendor/github.com/sirupsen/logrus/text_formatter.go
+++ b/vendor/github.com/sirupsen/logrus/text_formatter.go
@@ -53,7 +53,10 @@ type TextFormatter struct {
// the time passed since beginning of execution.
FullTimestamp bool
- // TimestampFormat to use for display when a full timestamp is printed
+ // TimestampFormat to use for display when a full timestamp is printed.
+ // The format to use is the same than for time.Format or time.Parse from the standard
+ // library.
+ // The standard Library already provides a set of predefined format.
TimestampFormat string
// The fields are sorted by default for a consistent output. For applications