Skip to content

Commit 4780203

Browse files
committed
Switch from OMQ_LOG_LEVEL to -l
1 parent 2c98d04 commit 4780203

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ messages published with perf-test can be consumed by `omq` or vice versa, and th
8888
--consumer-uri string URI for consuming
8989
-y, --consumers int The number of consumers to start (default 1)
9090
-h, --help help for omq
91+
-l, --log-level log-level Log level (debug, info, error) (default info)
9192
--log-out-of-order-messages Print a log line when a message is received that is older than the previously received message
9293
-d, --message-durability Mark messages as durable (default true)
9394
--message-priority string Message priority (0-255, default=unset)

cmd/root.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,14 @@ func RootCmd() *cobra.Command {
178178
}
179179
metricsServer := metrics.GetMetricsServer()
180180
metricsServer.Start()
181+
log.Setup()
181182

182183
},
183184
PersistentPostRun: func(cmd *cobra.Command, args []string) {
184185
},
185186
}
187+
rootCmd.PersistentFlags().
188+
VarP(enumflag.New(&log.Level, "log-level", log.Levels, enumflag.EnumCaseInsensitive), "log-level", "l", "Log level (debug, info, error)")
186189
rootCmd.PersistentFlags().StringVarP(&cfg.PublisherUri, "publisher-uri", "", "", "URI for publishing")
187190
rootCmd.PersistentFlags().StringVarP(&cfg.ConsumerUri, "consumer-uri", "", "", "URI for consuming")
188191
rootCmd.PersistentFlags().IntVarP(&cfg.Publishers, "publishers", "x", 1, "The number of publishers to start")

pkg/log/log.go

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,22 @@ package log
22

33
import (
44
"os"
5-
"strings"
65

76
"log/slog"
87
)
98

109
var logger *slog.Logger
1110

12-
func init() {
13-
var logLevelEnv = os.Getenv("OMQ_LOG_LEVEL")
14-
var logLevel slog.Level
15-
switch strings.ToUpper(logLevelEnv) {
16-
case "DEBUG":
17-
logLevel = slog.LevelDebug
18-
case "INFO":
19-
logLevel = slog.LevelInfo
20-
case "ERROR":
21-
logLevel = slog.LevelError
22-
default:
23-
logLevel = slog.LevelInfo
24-
}
25-
logger = slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logLevel}))
11+
var Levels = map[slog.Level][]string{
12+
slog.LevelDebug: {"debug"},
13+
slog.LevelInfo: {"info"},
14+
slog.LevelError: {"error"},
15+
}
16+
17+
var Level slog.Level
18+
19+
func Setup() {
20+
logger = slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: Level}))
2621
}
2722

2823
func Debug(format string, v ...interface{}) {

0 commit comments

Comments
 (0)