Tidy: formatting and import order
Build / build (push) Failing after 6s

This commit is contained in:
2026-05-14 11:40:54 -04:00
parent 477a86c18a
commit 74b148af20
3 changed files with 23 additions and 17 deletions
+14 -9
View File
@@ -71,12 +71,15 @@ cliParser =
) )
<*> optional <*> optional
( option ( option
(maybeReader (\s -> case T.toLower (T.pack s) of ( maybeReader
"debug" -> Just Debug ( \s -> case T.toLower (T.pack s) of
"info" -> Just Info "debug" -> Just Debug
"warn" -> Just Warn "info" -> Just Info
"error" -> Just Error "warn" -> Just Warn
_ -> Nothing)) "error" -> Just Error
_ -> Nothing
)
)
( long "log-level" ( long "log-level"
<> metavar "LEVEL" <> metavar "LEVEL"
<> help "Minimum log level: debug, info, warn, or error (default: info)" <> help "Minimum log level: debug, info, warn, or error (default: info)"
@@ -123,7 +126,10 @@ main = do
pure (opts, Just cfgPath) pure (opts, Just cfgPath)
else else
pure pure
( applyOverrides mDebounceOverride (cliLogLevel cli) (cliLogFile cli) ( applyOverrides
mDebounceOverride
(cliLogLevel cli)
(cliLogFile cli)
defaultOptions defaultOptions
{ optRepos = { optRepos =
[ defaultRepoConfig [ defaultRepoConfig
@@ -162,7 +168,6 @@ main = do
mapM_ (\r -> hPutStrLn stderr (" - " <> rcPath r)) repos mapM_ (\r -> hPutStrLn stderr (" - " <> rcPath r)) repos
runConverge options runConverge options
-- | Apply CLI overrides (debounce, log level, log file) to Options. -- | Apply CLI overrides (debounce, log level, log file) to Options.
applyOverrides :: Maybe Int -> Maybe LogLevel -> Maybe FilePath -> Options -> Options applyOverrides :: Maybe Int -> Maybe LogLevel -> Maybe FilePath -> Options -> Options
applyOverrides mDebounce mLogLevel mLogFile opts = applyOverrides mDebounce mLogLevel mLogFile opts =
@@ -170,6 +175,6 @@ applyOverrides mDebounce mLogLevel mLogFile opts =
{ optDebounceMs = maybe (optDebounceMs opts) id mDebounce { optDebounceMs = maybe (optDebounceMs opts) id mDebounce
, optLogLevel = fromMaybe (optLogLevel opts) mLogLevel , optLogLevel = fromMaybe (optLogLevel opts) mLogLevel
, optLogFile = case mLogFile of , optLogFile = case mLogFile of
Just _ -> mLogFile -- CLI --log-file overrides config Just _ -> mLogFile -- CLI --log-file overrides config
Nothing -> optLogFile opts Nothing -> optLogFile opts
} }
+8 -7
View File
@@ -80,10 +80,10 @@ data LogLevel
instance FromJSON LogLevel where instance FromJSON LogLevel where
parseJSON = withText "LogLevel" $ \t -> case T.toLower t of parseJSON = withText "LogLevel" $ \t -> case T.toLower t of
"debug" -> pure Debug "debug" -> pure Debug
"info" -> pure Info "info" -> pure Info
"warn" -> pure Warn "warn" -> pure Warn
"error" -> pure Error "error" -> pure Error
other -> fail $ "Unknown log level: " <> T.unpack other <> ". Expected: debug, info, warn, or error" other -> fail $ "Unknown log level: " <> T.unpack other <> ". Expected: debug, info, warn, or error"
-- | Top-level options for converge. -- | Top-level options for converge.
data Options = Options data Options = Options
@@ -198,8 +198,9 @@ configFileExists = defaultConfigPath >>= doesFileExist
-- Logging -- Logging
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- | Log a timestamped message at a given level. Messages below the {- | Log a timestamped message at a given level. Messages below the
-- Logger's configured minimum level are silently dropped. Logger's configured minimum level are silently dropped.
-}
logMsg :: Logger -> LogLevel -> Text -> IO () logMsg :: Logger -> LogLevel -> Text -> IO ()
logMsg (Logger lock lvl handle) level msg = logMsg (Logger lock lvl handle) level msg =
when (level >= lvl) $ when (level >= lvl) $
@@ -208,8 +209,8 @@ logMsg (Logger lock lvl handle) level msg =
let ts = T.pack $ formatTime defaultTimeLocale "%H:%M:%S" now let ts = T.pack $ formatTime defaultTimeLocale "%H:%M:%S" now
let levelTag = case level of let levelTag = case level of
Debug -> "DEBUG" Debug -> "DEBUG"
Info -> "INFO " Info -> "INFO "
Warn -> "WARN " Warn -> "WARN "
Error -> "ERROR" Error -> "ERROR"
hPutStrLn handle $ "[" <> T.unpack ts <> "] " <> levelTag <> " " <> T.unpack msg hPutStrLn handle $ "[" <> T.unpack ts <> "] " <> levelTag <> " " <> T.unpack msg
hFlush handle hFlush handle
+1 -1
View File
@@ -16,7 +16,7 @@ module TestHelper (
) where ) where
import Control.Concurrent.MVar (newMVar) import Control.Concurrent.MVar (newMVar)
import Converge (Logger (..), LogLevel (..)) import Converge (LogLevel (..), Logger (..))
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import System.Directory (createDirectory) import System.Directory (createDirectory)