This commit is contained in:
+14
-9
@@ -71,12 +71,15 @@ cliParser =
|
||||
)
|
||||
<*> optional
|
||||
( option
|
||||
(maybeReader (\s -> case T.toLower (T.pack s) of
|
||||
"debug" -> Just Debug
|
||||
"info" -> Just Info
|
||||
"warn" -> Just Warn
|
||||
"error" -> Just Error
|
||||
_ -> Nothing))
|
||||
( maybeReader
|
||||
( \s -> case T.toLower (T.pack s) of
|
||||
"debug" -> Just Debug
|
||||
"info" -> Just Info
|
||||
"warn" -> Just Warn
|
||||
"error" -> Just Error
|
||||
_ -> Nothing
|
||||
)
|
||||
)
|
||||
( long "log-level"
|
||||
<> metavar "LEVEL"
|
||||
<> help "Minimum log level: debug, info, warn, or error (default: info)"
|
||||
@@ -123,7 +126,10 @@ main = do
|
||||
pure (opts, Just cfgPath)
|
||||
else
|
||||
pure
|
||||
( applyOverrides mDebounceOverride (cliLogLevel cli) (cliLogFile cli)
|
||||
( applyOverrides
|
||||
mDebounceOverride
|
||||
(cliLogLevel cli)
|
||||
(cliLogFile cli)
|
||||
defaultOptions
|
||||
{ optRepos =
|
||||
[ defaultRepoConfig
|
||||
@@ -162,7 +168,6 @@ main = do
|
||||
mapM_ (\r -> hPutStrLn stderr (" - " <> rcPath r)) repos
|
||||
runConverge options
|
||||
|
||||
|
||||
-- | Apply CLI overrides (debounce, log level, log file) to Options.
|
||||
applyOverrides :: Maybe Int -> Maybe LogLevel -> Maybe FilePath -> Options -> Options
|
||||
applyOverrides mDebounce mLogLevel mLogFile opts =
|
||||
@@ -170,6 +175,6 @@ applyOverrides mDebounce mLogLevel mLogFile opts =
|
||||
{ optDebounceMs = maybe (optDebounceMs opts) id mDebounce
|
||||
, optLogLevel = fromMaybe (optLogLevel opts) mLogLevel
|
||||
, optLogFile = case mLogFile of
|
||||
Just _ -> mLogFile -- CLI --log-file overrides config
|
||||
Just _ -> mLogFile -- CLI --log-file overrides config
|
||||
Nothing -> optLogFile opts
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user