Skip to content

Commit

Permalink
Update bmclib to v0.4.4 and doing a mod tidy
Browse files Browse the repository at this point in the history
I had to change the logging in bmcbutler because the logging interface
was changed on bmclib in bmc-toolbox/bmclib#135.
To see bmclib logs from bmcbutler, run it with environment variable
BMCLIB_LOG_LEVEL=debug or BMCLIB_LOG_LEVEL=trace.
  • Loading branch information
Ahmed Abdrabo committed Nov 18, 2020
1 parent db61d45 commit df3097e
Show file tree
Hide file tree
Showing 641 changed files with 107,684 additions and 101,669 deletions.
10 changes: 4 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/bmc-toolbox/bmcbutler
go 1.14

require (
github.com/bmc-toolbox/bmclib v0.3.7
github.com/bmc-toolbox/bmclib v0.4.4
github.com/bmc-toolbox/bmclogin v0.0.3
github.com/bmc-toolbox/gin-go-metrics v0.0.0-20190425145145-130c9ad985ff
github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7 // indirect
Expand All @@ -14,11 +14,9 @@ require (
github.com/gocarina/gocsv v0.0.0-20181213162136-af1d9380204a
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/hashicorp/vault/api v1.0.4
github.com/pkg/errors v0.8.1 // indirect
github.com/sirupsen/logrus v1.4.1
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v0.0.3
github.com/spf13/viper v1.3.2
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c // indirect
gopkg.in/yaml.v2 v2.2.2
github.com/spf13/viper v1.7.1
gopkg.in/yaml.v2 v2.3.0

)
260 changes: 256 additions & 4 deletions go.sum

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions pkg/butler/msghandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package butler
import (
"github.com/sirupsen/logrus"

bmclibLogger "github.com/bmc-toolbox/bmclib/logging"
metrics "github.com/bmc-toolbox/gin-go-metrics"
)

Expand Down Expand Up @@ -31,16 +30,6 @@ func (b *Butler) msgHandler(msg Msg) {

metrics.IncrCounter([]string{"butler", "asset_recvd"}, 1)

//set bmclib logger params
bmclibLogger.SetFormatter(&logrus.TextFormatter{})
if log.Level == logrus.TraceLevel {
bmclibLogger.SetLevel(logrus.TraceLevel)
}

if log.Level == logrus.DebugLevel {
bmclibLogger.SetLevel(logrus.DebugLevel)
}

//if asset has no IPAddress, we can't do anything about it
if len(msg.Asset.IPAddresses) == 0 {
log.WithFields(logrus.Fields{
Expand Down
132 changes: 108 additions & 24 deletions vendor/github.com/bmc-toolbox/bmclib/discover/discover.go

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

Loading

0 comments on commit df3097e

Please sign in to comment.