mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Get verbosity level from verbose flag

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-28 23:39:16 +01:00
parent 6bd99f6da8
commit d52c45c603
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/stfs/cmd/root.go
View File

@@ -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))

6
cmd/stfs/cmd/serve_ftp.go
View File

@@ -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),

2
cmd/stfs/cmd/serve_http.go
View File

@@ -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{