From 0074631e0e23d20266f7670203cdb81a9ad94051 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 5 Sep 2023 09:16:25 +0200 Subject: [PATCH] chore: use bklog instead of logrus Co-authored-by: Justin Chadwell Signed-off-by: CrazyMax --- cmd/buildkitd/main.go | 4 ++-- executor/resources/monitor.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go index 25a4bb431c4d..3375c438a18c 100644 --- a/cmd/buildkitd/main.go +++ b/cmd/buildkitd/main.go @@ -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 @@ -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) diff --git a/executor/resources/monitor.go b/executor/resources/monitor.go index 95b954bcbe6f..25a53f280671 100644 --- a/executor/resources/monitor.go +++ b/executor/resources/monitor.go @@ -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 ( @@ -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) } }) @@ -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