Skip to content

Commit

Permalink
chore: use bklog instead of logrus
Browse files Browse the repository at this point in the history
Co-authored-by: Justin Chadwell <[email protected]>
Signed-off-by: CrazyMax <[email protected]>
  • Loading branch information
crazy-max and jedevc committed Sep 5, 2023
1 parent 980ea2d commit 0074631
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cmd/buildkitd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func main() {
// Stop if we are registering or unregistering against Windows SCM.
stop, err := registerUnregisterService(cfg.Root)
if err != nil {
logrus.Fatal(err)
bklog.L.Fatal(err)
}
if stop {
return nil
Expand Down Expand Up @@ -332,7 +332,7 @@ func main() {

// Launch as a Windows Service if necessary
if err := launchService(server); err != nil {
logrus.Fatal(err)
bklog.L.Fatal(err)
}

errCh := make(chan error, 1)
Expand Down
6 changes: 3 additions & 3 deletions executor/resources/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/moby/buildkit/executor/resources/types"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/network"
"github.com/prometheus/procfs"
"github.com/sirupsen/logrus"
)

const (
Expand Down Expand Up @@ -229,7 +229,7 @@ func NewMonitor() (*Monitor, error) {
return
}
if err := prepareCgroupControllers(); err != nil {
logrus.Warnf("failed to prepare cgroup controllers: %+v", err)
bklog.L.Warnf("failed to prepare cgroup controllers: %+v", err)
}
})

Expand Down Expand Up @@ -280,7 +280,7 @@ func prepareCgroupControllers() error {
}
if err := os.WriteFile(filepath.Join(defaultMountpoint, cgroupSubtreeFile), []byte("+"+c), 0); err != nil {
// ignore error
logrus.Warnf("failed to enable cgroup controller %q: %+v", c, err)
bklog.L.Warnf("failed to enable cgroup controller %q: %+v", c, err)
}
}
return nil
Expand Down

0 comments on commit 0074631

Please sign in to comment.