From d52c45c60372fccd7ae4ff2975228336a22ed1ca Mon Sep 17 00:00:00 2001
From: Felicitas Pojtinger <felicitas@pojtinger.com>
Date: Tue, 28 Dec 2021 23:39:16 +0100
Subject: [PATCH] feat: Get verbosity level from `verbose` flag

---
 cmd/stfs/cmd/root.go       | 6 +++---
 cmd/stfs/cmd/serve_ftp.go  | 6 ++----
 cmd/stfs/cmd/serve_http.go | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cmd/stfs/cmd/root.go b/cmd/stfs/cmd/root.go
index f613ff5..3e7c9e5 100644
--- a/cmd/stfs/cmd/root.go
+++ b/cmd/stfs/cmd/root.go
@@ -40,9 +40,9 @@ https://github.com/pojntfx/stfs`,
 			return err
 		}
 
-		if viper.GetBool(verboseFlag) {
+		if verbosity := viper.GetInt(verboseFlag); verbosity >= 4 {
 			boil.DebugMode = true
-			boil.DebugWriter = logging.NewJSONLoggerWriter(4, "SQL Query", "query")
+			boil.DebugWriter = logging.NewJSONLoggerWriter(verbosity, "SQL Query", "query")
 		}
 
 		if err := compression.CheckCompressionFormat(viper.GetString(compressionFlag)); err != nil {
@@ -67,7 +67,7 @@ func Execute() error {
 
 	rootCmd.PersistentFlags().StringP(driveFlag, "d", "/dev/nst0", "Tape or tar file to use")
 	rootCmd.PersistentFlags().StringP(metadataFlag, "m", metadataPath, "Metadata database to use")
-	rootCmd.PersistentFlags().BoolP(verboseFlag, "v", false, "Enable verbose logging")
+	rootCmd.PersistentFlags().IntP(verboseFlag, "v", 2, fmt.Sprintf("Verbosity level (default %v, available are %v)", 2, []int{0, 1, 2, 3, 4}))
 	rootCmd.PersistentFlags().StringP(compressionFlag, "c", config.NoneKey, fmt.Sprintf("Compression format to use (default %v, available are %v)", config.NoneKey, config.KnownCompressionFormats))
 	rootCmd.PersistentFlags().StringP(encryptionFlag, "e", config.NoneKey, fmt.Sprintf("Encryption format to use (default %v, available are %v)", config.NoneKey, config.KnownEncryptionFormats))
 	rootCmd.PersistentFlags().StringP(signatureFlag, "s", config.NoneKey, fmt.Sprintf("Signature format to use (default %v, available are %v)", config.NoneKey, config.KnownSignatureFormats))
diff --git a/cmd/stfs/cmd/serve_ftp.go b/cmd/stfs/cmd/serve_ftp.go
index cedab94..043c964 100644
--- a/cmd/stfs/cmd/serve_ftp.go
+++ b/cmd/stfs/cmd/serve_ftp.go
@@ -126,7 +126,7 @@ var serveFTPCmd = &cobra.Command{
 			return err
 		}
 
-		jsonLogger := logging.NewJSONLogger(4)
+		jsonLogger := logging.NewJSONLogger(viper.GetInt(verboseFlag))
 
 		readOps := operations.NewOperations(
 			config.BackendConfig{
@@ -235,9 +235,7 @@ var serveFTPCmd = &cobra.Command{
 			},
 		)
 
-		if viper.GetBool(verboseFlag) {
-			srv.Logger = jsonLogger
-		}
+		srv.Logger = jsonLogger
 
 		jsonLogger.Info("FTP server listening", map[string]interface{}{
 			"laddr": viper.GetString(laddrFlag),
diff --git a/cmd/stfs/cmd/serve_http.go b/cmd/stfs/cmd/serve_http.go
index 27464de..09129e4 100644
--- a/cmd/stfs/cmd/serve_http.go
+++ b/cmd/stfs/cmd/serve_http.go
@@ -85,7 +85,7 @@ var serveHTTPCmd = &cobra.Command{
 			return err
 		}
 
-		jsonLogger := logging.NewJSONLogger(4)
+		jsonLogger := logging.NewJSONLogger(viper.GetInt(verboseFlag))
 
 		readOps := operations.NewOperations(
 			config.BackendConfig{