flexabyte/go-kit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Refactor flags to use flagzog package
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 35s
Details

Browse Source 
Signed-off-by: Jan Tytgat <jan.tytgat@corelayer.eu>
This commit is contained in:
Jan Tytgat
2025-06-09 22:18:47 +02:00
parent 9adebbf0e2
commit fa641b06b2
4 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
application/logging.go
View File

@ -1,38 +1,47 @@
package application
import (
"fmt"
"log/slog"
"github.com/Oudwins/zog"
"github.com/spf13/cobra"
"git.flexabyte.io/flexabyte/go-kit/flagzog"
"git.flexabyte.io/flexabyte/go-kit/slogd"
)
const (
LogOutputStdOut = "stdout"
LogOutputStdErr = "stderr"
LogOutputFile = "file"
logLevelTrace = "trace"
logLevelDebug = "debug"
logLevelInfo = "info"
logLevelWarn = "warn"
logLevelError = "error"
logLevelFatal = "fatal"
logOutputStdout = "stdout"
logOutputStderr = "stderr"
logOutputFile = "file"
logTypeText = "text"
logTypeJson = "json"
logTypeColor = "color"
)
var (
logLevelFlagName string = "log-level"
logLevelFlag string
logOutputFlagName string = "log-output"
logOutputFlag string
logTypeFlagName = "log-type"
logTypeFlag string
logLevelFlag = flagzog.NewStringFlag("log-level", zog.String().OneOf([]string{logLevelTrace, logLevelDebug, logLevelInfo, logLevelWarn, logLevelError, logLevelFatal}), fmt.Sprintf("Set log level (%s, %s, %s, %s, %s, %s)", logLevelTrace, logLevelDebug, logLevelInfo, logLevelWarn, logLevelError, logLevelFatal))
logOutputFlag = flagzog.NewStringFlag("log-output", zog.String().OneOf([]string{logOutputStdout, logOutputStderr, logOutputFile}), fmt.Sprintf("Set log output (%s, %s, %s)", logOutputStdout, logOutputStderr, logOutputFile))
logTypeFlag = flagzog.NewStringFlag("log-type", zog.String().OneOf([]string{logTypeText, logTypeJson, logTypeColor}), fmt.Sprintf("Set log type (%s, %s, %s)", logTypeText, logTypeJson, logTypeColor))
)
func addLogLevelFlag(cmd *cobra.Command) {
cmd.PersistentFlags().StringVarP(&logLevelFlag, logLevelFlagName, "", "info", "Set log level (trace, debug, info, warn, error, fatal)")
cmd.PersistentFlags().StringVarP(&logLevelFlag.Value, logLevelFlag.Name(), "", logLevelInfo, logLevelFlag.Usage())
}
func addLogOutputFlag(cmd *cobra.Command) {
cmd.PersistentFlags().StringVarP(&logOutputFlag, logOutputFlagName, "", "stderr", "Set log output (stdout, stderr, file)")
cmd.PersistentFlags().StringVarP(&logOutputFlag.Value, logOutputFlag.Name(), "", logOutputStderr, logOutputFlag.Usage())
}
func addLogTypeFlag(cmd *cobra.Command) {
cmd.PersistentFlags().StringVarP(&logTypeFlag, logTypeFlagName, "", "text", "Set log type (text, json, color)")
cmd.PersistentFlags().StringVarP(&logTypeFlag.Value, logTypeFlag.Name(), "", logTypeText, logTypeFlag.Usage())
}
func configureLoggingFlags(cmd *cobra.Command) {
@ -40,7 +49,7 @@ func configureLoggingFlags(cmd *cobra.Command) {
addLogOutputFlag(cmd)
addLogTypeFlag(cmd)
cmd.MarkFlagsMutuallyExclusive("no-color", "log-type")
cmd.MarkFlagsMutuallyExclusive("no-color", logTypeFlag.Name())
}
func GetLogLevelFromArgs(args []string) slog.Level {