diff --git a/Changelog.md b/Changelog.md index f81567ea..959f0f5c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# [2019-07-18] 1.4.3 + +* Update: logrus-rollbar to v1.3.1 + # [2019-07-18] 1.4.2 * Fix: Health checker were stopped too early diff --git a/go.mod b/go.mod index 40087c87..a16a7583 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Scalingo/go-handlers v1.2.4 github.com/Scalingo/go-philae v0.0.0-20190503160133-6607dff74013 github.com/Scalingo/go-utils v5.5.9+incompatible - github.com/Scalingo/logrus-rollbar v1.3.0 // indirect + github.com/Scalingo/logrus-rollbar v1.3.1 // indirect github.com/Soulou/errgo-rollbar v0.0.0-20181001084048-9d551cd3bae9 // indirect github.com/codegangsta/negroni v1.0.0 // indirect github.com/coreos/etcd v3.3.13+incompatible diff --git a/go.sum b/go.sum index 44ed9d0e..d26f7f0d 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ github.com/Scalingo/go-utils v5.5.9+incompatible h1:lA6ltog6RZ/OJNvhQVC80Ao3cBsT github.com/Scalingo/go-utils v5.5.9+incompatible/go.mod h1:YcispJL9BCnNJwWxspalrRQ6zHAYPyNSnDLlfdfhxt8= github.com/Scalingo/logrus-rollbar v1.3.0 h1:EqyVUEOgBZfoDdgPVoTdG3rQzmwL/3a8PcKw/2hTJ80= github.com/Scalingo/logrus-rollbar v1.3.0/go.mod h1:Mo38Fue00mdY/UM5gOMTXAWfiOIJK29/sxL3zxb/68I= +github.com/Scalingo/logrus-rollbar v1.3.1 h1:sjD3RQXF5voEZIz9YtlL2aFIXfykrVXL5tGHCG5coIc= +github.com/Scalingo/logrus-rollbar v1.3.1/go.mod h1:Mo38Fue00mdY/UM5gOMTXAWfiOIJK29/sxL3zxb/68I= github.com/Soulou/errgo-rollbar v0.0.0-20181001084048-9d551cd3bae9 h1:bAJMdsbKHRclNzmTEL2gHAWl9nUhqLKHKFdrQnO3YtQ= github.com/Soulou/errgo-rollbar v0.0.0-20181001084048-9d551cd3bae9/go.mod h1:7+LUv1ler6IXAzrVgw3RPKL9CQ43oaLiEp2zv9Gr45E= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= @@ -25,7 +27,7 @@ github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882b github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= +github.com/coreos/etcd v3.3.13+incompatible h1:gLs8IvZUgVJwC3/b0ILSqPZoflsywDhG78behZnjk/s= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/vendor/github.com/Scalingo/logrus-rollbar/LICENSE b/vendor/github.com/Scalingo/logrus-rollbar/LICENSE new file mode 100644 index 00000000..f7715b36 --- /dev/null +++ b/vendor/github.com/Scalingo/logrus-rollbar/LICENSE @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2016-2018 Scalingo SAS + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/github.com/Scalingo/logrus-rollbar/hook.go b/vendor/github.com/Scalingo/logrus-rollbar/hook.go index a98cd37f..a7f6cbf8 100644 --- a/vendor/github.com/Scalingo/logrus-rollbar/hook.go +++ b/vendor/github.com/Scalingo/logrus-rollbar/hook.go @@ -65,14 +65,18 @@ func (h hook) Fire(entry *logrus.Entry) error { err error ) + msg := entry.Message + if entry.Data["msg"] != nil { + msg = fmt.Sprintf("%s - %v", msg, entry.Data["msg"]) + } + if entry.Data["error"] != nil { err = entry.Data["error"].(error) errorTxt := new(bytes.Buffer) errorTxt.WriteString(err.Error()) - if entry.Message != "" { - errorTxt.WriteString(" - " + entry.Message) - } + errorTxt.WriteString(" - " + msg) + msg := errorTxt.String() switch err.(type) { @@ -87,7 +91,7 @@ func (h hook) Fire(entry *logrus.Entry) error { err = Wrap(msg, err) } } else { - err = errors.New(fmt.Sprintf("%v", entry.Data["msg"])) + err = errors.New(msg) } severity := rollbar.ERR diff --git a/vendor/modules.txt b/vendor/modules.txt index 29758986..56238ef3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -9,7 +9,7 @@ github.com/Scalingo/go-utils/etcd github.com/Scalingo/go-utils/logger github.com/Scalingo/go-utils/logger/plugins/rollbarplugin github.com/Scalingo/go-utils/errors -# github.com/Scalingo/logrus-rollbar v1.3.0 +# github.com/Scalingo/logrus-rollbar v1.3.1 github.com/Scalingo/logrus-rollbar # github.com/Soulou/errgo-rollbar v0.0.0-20181001084048-9d551cd3bae9 github.com/Soulou/errgo-rollbar