Somewhat improve a bunch of log messages

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/10826
GitOrigin-RevId: 5eacf178f27e7fda9bf3014f158e4325d17b1acd
This commit is contained in:
Daniel Harvey 2024-05-22 10:42:36 +01:00 committed by hasura-bot
parent 0551a78246
commit 61f2b6d462
3 changed files with 12 additions and 10 deletions

View File

@ -1000,7 +1000,7 @@ runHGEServer setupHook appStateRef initTime startupStatusHook consoleType ekgSto
shutdownHandler closeSocket =
LA.link =<< LA.async do
waitForShutdown appEnvShutdownLatch
unLogger logger $ mkGenericLog @Text LevelInfo "server" "gracefully shutting down server"
unLogger logger $ mkGenericLog @Text LevelInfo "server" "Gracefully shutting down server"
closeSocket
finishTime <- liftIO Clock.getCurrentTime
@ -1008,7 +1008,7 @@ runHGEServer setupHook appStateRef initTime startupStatusHook consoleType ekgSto
lift
$ unLoggerTracing logger
$ mkGenericLog LevelInfo "server"
$ StartupTimeInfo "starting API server" apiInitTime
$ StartupTimeInfo "Starting API server" apiInitTime
-- Here we block until the shutdown latch 'MVar' is filled, and then
-- shut down the server. Once this blocking call returns, we'll tidy up
@ -1096,6 +1096,8 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
case appEnvEventingMode of
EventingEnabled -> do
lift $ unLoggerTracing logger $ mkGenericLog @Text LevelInfo "server" "Starting in eventing enabled mode"
startEventTriggerPollerThread logger appEnvLockedEventsCtx
startAsyncActionsPollerThread logger appEnvLockedEventsCtx actionSubState
@ -1112,7 +1114,7 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
startScheduledEventsPollerThread logger appEnvLockedEventsCtx
EventingDisabled ->
lift $ unLoggerTracing logger $ mkGenericLog @Text LevelInfo "server" "starting in eventing disabled mode"
lift $ unLoggerTracing logger $ mkGenericLog @Text LevelInfo "server" "Starting in eventing disabled mode"
-- start a background thread to check for updates
_updateThread <-
@ -1178,7 +1180,7 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
getSchemaCache' = getSchemaCache appStateRef
prepareScheduledEvents (LoggerTracing logger) = do
logger $ mkGenericLog @Text LevelInfo "scheduled_triggers" "unlocking all locked scheduled events"
logger $ mkGenericLog @Text LevelInfo "scheduled_triggers" "Unlocking all locked scheduled events on `hdb_scheduled_events` and `hdb_cron_events` tables"
res <- Retry.retrying Retry.retryPolicyDefault isRetryRequired (return unlockAllLockedScheduledEvents)
onLeft res (\err -> logger $ mkGenericLog @String LevelError "scheduled_triggers" (show $ qeError err))
@ -1200,7 +1202,7 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
forM_ sources $ \backendSourceInfo -> do
AB.dispatchAnyBackend @BackendEventTrigger backendSourceInfo \(SourceInfo {..} :: SourceInfo b) -> do
let sourceNameText = sourceNameToText _siName
logger $ mkGenericLog LevelInfo "event_triggers" $ "unlocking events of source: " <> sourceNameText
logger $ mkGenericLog LevelInfo "event_triggers" $ "Unlocking events for source: " <> sourceNameText
for_ (HashMap.lookup _siName lockedEvents) $ \sourceLockedEvents -> do
-- No need to execute unlockEventsTx when events are not present
for_ (NE.nonEmptySet sourceLockedEvents) $ \nonEmptyLockedEvents -> do
@ -1209,7 +1211,7 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
Left err ->
logger
$ mkGenericLog LevelWarn "event_trigger"
$ "Error while unlocking event trigger events of source: "
$ "Error while unlocking event trigger events for source: "
<> sourceNameText
<> " error:"
<> showQErr err
@ -1217,7 +1219,7 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
logger
$ mkGenericLog LevelInfo "event_trigger"
$ tshow count
<> " events of source "
<> " events for source "
<> sourceNameText
<> " were successfully unlocked"
@ -1297,7 +1299,7 @@ mkHGEServer setupHook appStateRef consoleType ekgStore = do
(createFetchedEventsStatsLogger logger)
(closeFetchedEventsStatsLogger logger)
lift $ unLoggerTracing logger $ mkGenericLog @Text LevelInfo "event_triggers" "starting workers"
lift $ unLoggerTracing logger $ mkGenericLog @Text LevelInfo "event_triggers" "Starting workers"
void
$ C.forkManagedTWithGracefulShutdown
"processEventQueue"

View File

@ -205,7 +205,7 @@ buildGQLContext
case res of
Left err ->
pure $ \_ _ _ ->
unLogger logger $ mkGenericLog @Text LevelWarn "schema-registry" ("failed to fetch the time from metadata db correctly: " <> showQErr err)
unLogger logger $ mkGenericLog @Text LevelWarn "schema-registry" ("Failed to fetch the time from metadata db correctly: " <> showQErr err)
Right now -> do
let schemaRegistryMap = generateSchemaRegistryMap hasuraContexts
projectSchemaInfo = \metadataResourceVersion inconsistentMetadata metadata ->

View File

@ -386,7 +386,7 @@ fetchJwk ::
m (Jose.JWKSet, ResponseHeaders)
fetchJwk (Logger logger) manager url = do
let urlT = tshow url
infoMsg = "refreshing JWK from endpoint: " <> urlT
infoMsg = "Refreshing JWK from endpoint: " <> urlT
liftIO $ logger $ JwkRefreshLog LevelInfo (Just infoMsg) Nothing
res <- try $ do
req <- liftIO $ HTTP.mkRequestThrow $ tshow url