Translate log levels to Kore log entries correctly

Author: geo2a

booster/tools/booster/Server.hs

@@ -31,7 +31,7 @@ import Data.InternedText (globalInternedTextCache)
 import Data.List (intercalate)
 import Data.List.Extra (splitOn)
 import Data.Map qualified as Map
-import Data.Maybe (fromMaybe, isJust, mapMaybe)
+import Data.Maybe (fromMaybe, isJust, mapMaybe, maybeToList)
 import Data.Set qualified as Set
 import Data.Text qualified as Text
 import Data.Text.Encoding qualified as Text (decodeUtf8, encodeUtf8)
@@ -151,7 +151,10 @@ main = do
             let koreLogActions :: forall m. MonadIO m => [LogAction m Log.SomeEntry]
                 koreLogActions = [koreStandardPrettyLogAction, koreJsonLogAction]
                   where
-                    logAsJson entry = Log.entryTypeText entry == "DebugAttemptEquation"
+                    logAsJson =
+                        if (Logger.LevelOther "SimplifyJson") `elem` customLevels
+                            then \entry -> Log.entryTypeText entry `elem` getKoreEntriesForLevel (Logger.LevelOther "SimplifyJson")
+                            else const False
 
                     koreStandardPrettyLogAction =
                         koreSomeEntryLogAction
@@ -315,6 +318,9 @@ logLevelToKoreLogEntryMap =
         , (LevelOther "RewriteSuccess", ["DebugAppliedRewriteRules"])
         ]
 
+getKoreEntriesForLevel :: LogLevel -> [Text.Text]
+getKoreEntriesForLevel level = concat . maybeToList $ Map.lookup level logLevelToKoreLogEntryMap
+
 data CLProxyOptions = CLProxyOptions
     { clOptions :: CLOptions
     , proxyOptions :: ProxyOptions

dev-tools/kore-rpc-dev/Server.hs

@@ -29,7 +29,7 @@ import Data.Conduit.Network (serverSettings)
 import Data.IORef (writeIORef)
 import Data.InternedText (globalInternedTextCache)
 import Data.Map qualified as Map
-import Data.Maybe (fromMaybe, mapMaybe)
+import Data.Maybe (fromMaybe, mapMaybe, maybeToList)
 import Data.Set qualified as Set
 import Data.Text (Text)
 import Data.Text qualified as Text
@@ -174,7 +174,10 @@ main = do
                     [LogAction m Log.SomeEntry]
                 koreLogActions = [koreStandardPrettyLogAction, koreJsonLogAction]
                   where
-                    logAsJson entry = Log.entryTypeText entry == "DebugAttemptEquation"
+                    logAsJson =
+                        if (Logger.LevelOther "SimplifyJson") `elem` customLevels
+                            then \entry -> Log.entryTypeText entry `elem` getKoreEntriesForLevel (Logger.LevelOther "SimplifyJson")
+                            else const False
 
                     koreStandardPrettyLogAction =
                         koreSomeEntryLogAction
@@ -269,6 +272,9 @@ logLevelToKoreLogEntryMap =
         , (LevelOther "RewriteSuccess", ["DebugAppliedRewriteRules"])
         ]
 
+getKoreEntriesForLevel :: LogLevel -> [Text.Text]
+getKoreEntriesForLevel level = concat . maybeToList $ Map.lookup level logLevelToKoreLogEntryMap
+
 newtype CLProxyOptions = CLProxyOptions
     { clOptions :: CLOptions
     }