make level log configurable by cli flag

Co-authored-by: mirkoCrobu <mirkocrobu@NB-0531.localdomain>
Co-authored-by: Luca Rinaldi <lucarin@protonmail.com>

Author: 3 people

cmd/arduino-app-cli/app/restart.go

@@ -1,8 +1,6 @@
 package app
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
 	"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/completion"
@@ -25,7 +23,7 @@ func newRestartCmd(cfg config.Configuration) *cobra.Command {
 				return nil
 			}
 			if err := stopHandler(cmd.Context(), app); err != nil {
-				feedback.Warning(fmt.Sprintf("failed to stop app: %s", err.Error()))
+				feedback.Warnf("failed to stop app: %s", err.Error())
 			}
 			return startHandler(cmd.Context(), cfg, app)
 		},

cmd/arduino-app-cli/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"cmp"
 	"context"
 	"fmt"
 	"log/slog"
@@ -28,17 +27,11 @@ import (
 // Version will be set a build time with -ldflags
 var Version string = "0.0.0-dev"
 var format string
+var logLevelStr string
 
 func run(configuration cfg.Configuration) error {
 	servicelocator.Init(configuration)
 	defer func() { _ = servicelocator.CloseDockerClient() }()
-
-	logLevel, err := ParseLogLevel(cmp.Or(os.Getenv("ARDUINO_APP_CLI__LOG_LEVEL"), "INFO"))
-	if err != nil {
-		return err
-	}
-	slog.SetLogLoggerLevel(logLevel)
-
 	rootCmd := &cobra.Command{
 		Use:   "arduino-app-cli",
 		Short: "A CLI to manage the Python app",
@@ -47,13 +40,18 @@ func run(configuration cfg.Configuration) error {
 			if !ok {
 				feedback.Fatal(i18n.Tr("Invalid output format: %s", format), feedback.ErrBadArgument)
 			}
-			feedback.SetFormat(format)
+			logLevel, err := ParseLogLevel(logLevelStr)
+			if err != nil {
+				feedback.FatalError(err, feedback.ErrBadArgument)
+			}
+			slog.SetLogLoggerLevel(logLevel)
 		},
 		SilenceUsage:  true,
 		SilenceErrors: true,
 	}
 
 	rootCmd.PersistentFlags().StringVar(&format, "format", "text", "Output format (text, json)")
+	rootCmd.PersistentFlags().StringVar(&logLevelStr, "log-level", "error", "Set the log level (debug, info, warn, error)")
 
 	rootCmd.AddCommand(
 		app.NewAppCmd(configuration),

cmd/feedback/feedback.go

@@ -5,11 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 
 	"github.com/arduino/arduino-app-cli/cmd/i18n"
-
-	"github.com/sirupsen/logrus"
 )
 
 // OutputFormat is an output format
@@ -140,13 +139,14 @@ func Print(v string) {
 }
 
 // Warning outputs a warning message.
-func Warning(msg string) {
+func Warnf(msg string, args ...interface{}) {
+	msg = fmt.Sprintf(msg, args...)
 	if format == Text {
 		fmt.Fprintln(feedbackErr, msg)
 	} else {
 		bufferWarnings = append(bufferWarnings, msg)
 	}
-	logrus.Warning(msg)
+	slog.Warn(msg)
 }
 
 // FatalError outputs the error and exits with status exitCode.

debian/arduino-app-cli/etc/systemd/system/arduino-app-cli.service

@@ -5,10 +5,9 @@ Wants=network-online.target docker.service arduino-router.service
 Requires=docker.service arduino-router.service
 
 [Service]
-ExecStart=/usr/bin/arduino-app-cli daemon --port 8800
+ExecStart=/usr/bin/arduino-app-cli daemon --port 8800 --log-level error
 User=arduino
 Group=arduino
-Environment="ARDUINO_APP_CLI__LOG_LEVEL=ERROR"
 Environment="ARDUINO_ROUTER_SOCKET=/var/run/arduino-router.sock"
 StandardOutput=journal
 StandardError=journal

internal/orchestrator/system.go

@@ -80,7 +80,7 @@ func pullImage(ctx context.Context, stdout io.Writer, docker dockerClient.APICli
 			return allErr // Non-retryable error
 		}
 
-		feedback.Printf("Warning: received 'toomanyrequests' error from Docker registry, retrying in %s ...", delay)
+		feedback.Warnf("received 'toomanyrequests' error from Docker registry, retrying in %s ...", delay)
 
 		select {
 		case <-ctx.Done():
@@ -217,19 +217,19 @@ func SystemCleanup(ctx context.Context, cfg config.Configuration, staticStore *s
 	// Remove running app and dangling containers
 	runningApp, err := getRunningApp(ctx, docker.Client())
 	if err != nil {
-		feedback.Printf("Warning: failed to get running app - %v", err)
+		feedback.Warnf("failed to get running app - %v", err)
 	}
 	if runningApp != nil {
 		for item := range StopAndDestroyApp(ctx, *runningApp) {
 			if item.GetType() == ErrorType {
-				feedback.Printf("Warning: failed to stop and destroy running app - %v", item.GetError())
+				feedback.Warnf("failed to stop and destroy running app - %v", item.GetError())
 				break
 			}
 		}
 		result.RunningAppRemoved = true
 	}
 	if count, err := removeDanglingContainers(ctx, docker.Client()); err != nil {
-		feedback.Printf("Warning: failed to remove dangling containers - %v", err)
+		feedback.Warnf("failed to remove dangling containers - %v", err)
 	} else {
 		result.ContainersRemoved = count
 	}
@@ -250,7 +250,7 @@ func SystemCleanup(ctx context.Context, cfg config.Configuration, staticStore *s
 	for _, image := range imagesToRemove {
 		imageSize, err := removeImage(ctx, docker.Client(), image)
 		if err != nil {
-			feedback.Printf("Warning: failed to remove image %s - %v", image, err)
+			feedback.Warnf("failed to remove image %s - %v", image, err)
 			continue
 		}
 		result.SpaceFreed += imageSize
@@ -263,7 +263,7 @@ func SystemCleanup(ctx context.Context, cfg config.Configuration, staticStore *s
 func removeImage(ctx context.Context, docker dockerClient.APIClient, imageName string) (int64, error) {
 	var size int64
 	if info, err := docker.ImageInspect(ctx, imageName); err != nil {
-		feedback.Printf("Warning: failed to inspect image %s - %v", imageName, err)
+		feedback.Warnf("failed to inspect image %s - %v", imageName, err)
 	} else {
 		size = info.Size
 	}