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
+9 -4
View File
@@ -71,12 +71,15 @@ cliParser =
) )
<*> optional <*> optional
( option ( option
(maybeReader (\s -> case T.toLower (T.pack s) of ( maybeReader
( \s -> case T.toLower (T.pack s) of
"debug" -> Just Debug "debug" -> Just Debug
"info" -> Just Info "info" -> Just Info
"warn" -> Just Warn "warn" -> Just Warn
"error" -> Just Error "error" -> Just Error
_ -> Nothing)) _ -> 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 =
+3 -2
View File
@@ -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) $
+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)