Skip to content

Fix handling of logging contextx in booster-dev #4051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Fix handling of logging contextx in booster-dev #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c257b17
List available logging formats, fix logging filter in Booster
geo2a Sep 25, 2024
7c7cb8f
Add "[request id]" context to booster-dev logs
geo2a Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions booster/library/Booster/CLOptions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ data LogFormat
= Standard
| OneLine
| Json
deriving (Eq)
deriving (Eq, Enum)

instance Show LogFormat where
show = \case
Expand Down Expand Up @@ -155,7 +155,10 @@ parseLogOptions =
( metavar "LOGFORMAT"
<> value OneLine
<> long "log-format"
<> help "Format to output logs in"
<> help
( "Format to output logs in. Available formats: "
<> intercalate ", " (map show $ enumFrom (toEnum @LogFormat 0))
)
<> showDefault
)
<*> many
Expand Down
6 changes: 4 additions & 2 deletions dev-tools/booster-dev/Server.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ runServer port definitions defaultMain mLlvmLibrary rewriteOpts logFile mSMTOpti
withFastLogger mTimeCache logFile $ \stderrLogger mFileLogger -> do
let boosterContextLogger = case logFormat of
Json -> Booster.Log.jsonLogger $ fromMaybe stderrLogger mFileLogger
_ -> Booster.Log.textLogger stderrLogger
_ -> Booster.Log.textLogger $ fromMaybe stderrLogger mFileLogger
filteredBoosterContextLogger =
flip Booster.Log.filterLogger boosterContextLogger $ \(Booster.Log.LogMessage (Booster.Flag alwaysDisplay) ctxts _) ->
alwaysDisplay
Expand All @@ -163,10 +163,12 @@ runServer port definitions defaultMain mLlvmLibrary rewriteOpts logFile mSMTOpti
}
jsonRpcServer
(serverSettings port "*")
( const $
( \rawReq req ->
flip runReaderT (filteredBoosterContextLogger, toModifiersRep prettyPrintOptions)
. Booster.Log.unLoggerT
. Booster.Log.withContextFor (getReqId rawReq)
. Booster.Log.withContext Booster.Log.CtxBooster
. respond stateVar
$ req
)
[handleSmtError, RpcError.handleErrorCall, RpcError.handleSomeException]
Loading