diff --git a/cmd/osbuild-composer/composer.go b/cmd/osbuild-composer/composer.go index 6cd3afd22..670720546 100644 --- a/cmd/osbuild-composer/composer.go +++ b/cmd/osbuild-composer/composer.go @@ -24,6 +24,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/weldr" "github.com/osbuild/osbuild-composer/internal/worker" + logrus "github.com/sirupsen/logrus" ) type Composer struct { @@ -62,6 +63,7 @@ func NewComposer(config *ComposerConfigFile, stateDir, cacheDir string, logger * } c.distros = distroregistry.NewDefault() + logrus.Info(fmt.Sprintf("Loaded %d distros", len(c.distros.List()))) c.rpm = rpmmd.NewRPMMD(path.Join(c.cacheDir, "rpmmd"), "/usr/libexec/osbuild-composer/dnf-json") diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go index 13495288a..1fce3e92a 100644 --- a/cmd/osbuild-composer/main.go +++ b/cmd/osbuild-composer/main.go @@ -48,46 +48,46 @@ func main() { logrus.Info("Failed to load loglevel from config:", err) } - log.Println("Loaded configuration:") - err = DumpConfig(config, log.Writer()) + logrus.Info("Loaded configuration:") + err = DumpConfig(config, logrus.StandardLogger().WriterLevel(logrus.InfoLevel)) if err != nil { - log.Fatalf("Error printing configuration: %v", err) + logrus.Fatalf("Error printing configuration: %v", err) } stateDir, ok := os.LookupEnv("STATE_DIRECTORY") if !ok { - log.Fatal("STATE_DIRECTORY is not set. Is the service file missing StateDirectory=?") + logrus.Fatal("STATE_DIRECTORY is not set. Is the service file missing StateDirectory=?") } cacheDir, ok := os.LookupEnv("CACHE_DIRECTORY") if !ok { - log.Fatal("CACHE_DIRECTORY is not set. Is the service file missing CacheDirectory=?") + logrus.Fatal("CACHE_DIRECTORY is not set. Is the service file missing CacheDirectory=?") } composer, err := NewComposer(config, stateDir, cacheDir, logger) if err != nil { - log.Fatalf("%v", err) + logrus.Fatalf("%v", err) } listeners, err := activation.ListenersWithNames() if err != nil { - log.Fatalf("Could not get listening sockets: " + err.Error()) + logrus.Fatalf("Could not get listening sockets: " + err.Error()) } if l, exists := listeners["osbuild-composer.socket"]; exists { if len(l) != 1 { - log.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain only one socket.") + logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain only one socket.") } err = composer.InitWeldr(repositoryConfigs, l[0], config.weldrDistrosImageTypeDenyList()) if err != nil { - log.Fatalf("Error initializing weldr API: %v", err) + logrus.Fatalf("Error initializing weldr API: %v", err) } } if l, exists := listeners["osbuild-local-worker.socket"]; exists { if len(l) != 1 { - log.Fatal("The osbuild-local-worker.socket unit is misconfigured. It should contain only one socket.") + logrus.Fatal("The osbuild-local-worker.socket unit is misconfigured. It should contain only one socket.") } composer.InitLocalWorker(l[0]) @@ -95,28 +95,28 @@ func main() { if l, exists := listeners["osbuild-composer-api.socket"]; exists { if len(l) != 1 { - log.Fatal("The osbuild-composer-api.socket unit is misconfigured. It should contain only one socket.") + logrus.Fatal("The osbuild-composer-api.socket unit is misconfigured. It should contain only one socket.") } err = composer.InitAPI(ServerCertFile, ServerKeyFile, config.ComposerAPI.EnableJWT, l[0]) if err != nil { - log.Fatalf("Error initializing koji API: %v", err) + logrus.Fatalf("Error initializing koji API: %v", err) } } if l, exists := listeners["osbuild-remote-worker.socket"]; exists { if len(l) != 1 { - log.Fatal("The osbuild-remote-worker.socket unit is misconfigured. It should contain only one socket.") + logrus.Fatal("The osbuild-remote-worker.socket unit is misconfigured. It should contain only one socket.") } err = composer.InitRemoteWorkers(ServerCertFile, ServerKeyFile, config.Worker.EnableJWT, l[0]) if err != nil { - log.Fatalf("Error initializing worker API: %v", err) + logrus.Fatalf("Error initializing worker API: %v", err) } } err = composer.Start() if err != nil { - log.Fatalf("%v", err) + logrus.Fatalf("%v", err) } }