From 0fe9c71529ccdf0719caf68b414750132bc9fb91 Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Mon, 22 Apr 2024 16:18:08 -0500 Subject: [PATCH] chore: add log-level=debug --- src/PostgREST/Config.hs | 4 +++- src/PostgREST/Logger.hs | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs index 6d4de526da7..e13cbf49976 100644 --- a/src/PostgREST/Config.hs +++ b/src/PostgREST/Config.hs @@ -114,7 +114,7 @@ data AppConfig = AppConfig , configInternalSCSleep :: Maybe Int32 } -data LogLevel = LogCrit | LogError | LogWarn | LogInfo +data LogLevel = LogCrit | LogError | LogWarn | LogInfo | LogDebug deriving (Eq, Ord) dumpLogLevel :: LogLevel -> Text @@ -123,6 +123,7 @@ dumpLogLevel = \case LogError -> "error" LogWarn -> "warn" LogInfo -> "info" + LogDebug -> "debug" data OpenAPIMode = OAFollowPriv | OAIgnorePriv | OADisabled deriving Eq @@ -338,6 +339,7 @@ parser optPath env dbSettings roleSettings roleIsolationLvl = Just "error" -> pure LogError Just "warn" -> pure LogWarn Just "info" -> pure LogInfo + Just "debug" -> pure LogDebug Just _ -> fail "Invalid logging level. Check your configuration." parseTxEnd :: C.Key -> ((Bool, Bool) -> Bool) -> C.Parser C.Config Bool diff --git a/src/PostgREST/Logger.hs b/src/PostgREST/Logger.hs index 55ab16a6c3f..1a4145c52ff 100644 --- a/src/PostgREST/Logger.hs +++ b/src/PostgREST/Logger.hs @@ -56,10 +56,11 @@ logWithDebounce loggerState action = do middleware :: LogLevel -> (Wai.Request -> Maybe BS.ByteString) -> Wai.Middleware middleware logLevel getAuthRole = case logLevel of - LogInfo -> requestLogger (const True) - LogWarn -> requestLogger (>= status400) - LogError -> requestLogger (>= status500) LogCrit -> requestLogger (const False) + LogError -> requestLogger (>= status500) + LogWarn -> requestLogger (>= status400) + LogInfo -> requestLogger (const True) + LogDebug -> requestLogger (const True) where requestLogger filterStatus = unsafePerformIO $ Wai.mkRequestLogger Wai.defaultRequestLoggerSettings @@ -84,6 +85,9 @@ observationLogger loggerState logLevel obs = case obs of o@(HasqlPoolObs _) -> do when (logLevel >= LogInfo) $ do logWithZTime loggerState $ observationMessage o + o@(SchemaCacheLoadedObs _) -> do + when (logLevel >= LogDebug) $ do + logWithZTime loggerState $ observationMessage o o -> logWithZTime loggerState $ observationMessage o