Skip to content

Commit 01dc4d6

Browse files
committed
fix --lines CLI argument
Fixes: #1037
1 parent 09b3c07 commit 01dc4d6

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/posener/complete v1.2.3
1919
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2020
github.com/stretchr/testify v1.9.0
21-
github.com/synfinatic/flexlog v0.0.3
21+
github.com/synfinatic/flexlog v0.0.5
2222
github.com/synfinatic/gotable v0.0.3
2323
github.com/willabides/kongplete v0.2.0
2424
golang.org/x/crypto v0.25.0 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
394394
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
395395
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
396396
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
397-
github.com/synfinatic/flexlog v0.0.3 h1:RUTlSnkzxIi1r6/X1QNbMI1D1butjF5fhMF/3HT/mkU=
398-
github.com/synfinatic/flexlog v0.0.3/go.mod h1:73burLPh9m9iL538Gq95AqkyOQjb15FkO4UW4hf8qm0=
397+
github.com/synfinatic/flexlog v0.0.5 h1:20NPoHt9KH1Acz4Z/em4e77takmydkQTGfdnGOlZVw0=
398+
github.com/synfinatic/flexlog v0.0.5/go.mod h1:ukL0npznLj2SG+67DRqb+i36YAZMINKYI+985kiqxvg=
399399
github.com/synfinatic/gotable v0.0.3 h1:KI01OLECmOv7laXVNtw6T4kEHue09z9OuQwtNB8D5Mw=
400400
github.com/synfinatic/gotable v0.0.3/go.mod h1:kWXD1bxZY6tyu6tWK3CIbGAOrtF7teg0ZQotUMDvoMw=
401401
github.com/veqryn/slog-json v0.3.0 h1:jI2ORtKP1uQss4zmTR2uCpIDw/XnUvVdr5+0vDNl4Gk=

internal/logger/init.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
var logger flexlog.FlexLogger
12-
var CreateLogger flexlog.NewLoggerFunc
12+
var CreateLogger flexlog.NewLoggerFunc = flexlog.NewConsole
1313

1414
// initialize the default logger to log to stderr and log at the warn level
1515
func init() {
@@ -18,7 +18,7 @@ func init() {
1818
addSource := false
1919
level := slog.LevelWarn
2020

21-
logger = flexlog.NewLogger(flexlog.NewConsole, w, addSource, level, color)
21+
logger = flexlog.NewLogger(CreateLogger, w, addSource, level, color)
2222

2323
slog.SetDefault(logger.GetLogger())
2424
}
@@ -45,7 +45,7 @@ func SwitchLogger(name string) {
4545
var ok bool
4646
CreateLogger, ok = loggers[name]
4747
if !ok {
48-
logger.Fatal("Invalid logger", "name", name)
48+
logger.Fatal("invalid logger", "name", name)
4949
}
5050

5151
// switch the logger

internal/sso/settings.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,6 @@ func (s *Settings) Save(configFile string, overwrite bool) error {
305305
// configure our settings using the overrides
306306
func (s *Settings) setOverrides(override OverrideSettings) {
307307
// Setup Logging
308-
if override.LogLines {
309-
s.LogLines = true
310-
}
311-
312-
if s.LogLines {
313-
log.SetReportCaller(true)
314-
}
315-
316308
if override.LogLevel != "" {
317309
s.LogLevel = override.LogLevel
318310
}
@@ -322,6 +314,11 @@ func (s *Settings) setOverrides(override OverrideSettings) {
322314
log.Fatal("Invalid log level", "level", s.LogLevel, "error", err.Error())
323315
}
324316

317+
if override.LogLines {
318+
s.LogLines = true
319+
}
320+
log.SetReportCaller(s.LogLines)
321+
325322
// Other overrides from CLI
326323
if override.Browser != "" {
327324
s.Browser = override.Browser

0 commit comments

Comments
 (0)