Unifying mutiline list layout

IntersectMBO · Aug 17, 2021 · 6073f69 · 6073f69
1 parent c43e6e3
commit 6073f69
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 49 deletions.
diff --git a/trace-dispatcher/examples/Examples/Aggregation.hs b/trace-dispatcher/examples/Examples/Aggregation.hs
@@ -32,8 +32,8 @@ instance LogFormatting BaseStats where
 
 baseStatsDocumented :: Documented Double
 baseStatsDocumented =
-  Documented [
-    DocMsg 0.0 [] "This is the value of the measurement"
+  Documented
+  [ DocMsg 0.0 [] "This is the value of the measurement"
   , DocMsg 0.0 [] "This is the sum of all measurments so far"
   ]
 

diff --git a/trace-dispatcher/examples/Examples/Configuration.hs b/trace-dispatcher/examples/Examples/Configuration.hs
@@ -25,8 +25,8 @@ instance LogFormatting TestMessage where
            ]
 
 testMessageDocumented :: Documented TestMessage
-testMessageDocumented = Documented [
-  DocMsg (TestMessage "dummy") [] "just a text"
+testMessageDocumented = Documented
+  [ DocMsg (TestMessage "dummy") [] "just a text"
   ]
 
 tracers :: MonadIO m => m (Trace m TestMessage, Trace m TestMessage)
@@ -40,19 +40,22 @@ tracers  = do
 config1 :: TraceConfig
 config1 = TraceConfig {
       tcOptions = Map.fromList
-          [([], [CoSeverity SilenceF]),
-          (["tracer1"], [CoSeverity ErrorF]),
-          (["tracer2"], [CoSeverity CriticalF]),
-          (["tracer2","bubble"], [CoSeverity InfoF])]
+          [ ([], [CoSeverity SilenceF])
+          , (["tracer1"], [CoSeverity ErrorF])
+          , (["tracer2"], [CoSeverity CriticalF])
+          , (["tracer2","bubble"], [CoSeverity InfoF])
+          ]
     , tcForwarder = LocalSocket "forwarder.log"
     , tcForwarderQueueSize = 100
     }
 
 config2 :: TraceConfig
 config2 = TraceConfig {
-      tcOptions = Map.fromList [([], [CoSeverity InfoF]),
-          (["tracer2"], [CoSeverity WarningF]),
-          (["tracer2","bubble"], [CoSeverity WarningF])]
+      tcOptions = Map.fromList
+        [ ([], [CoSeverity InfoF])
+        , (["tracer2"], [CoSeverity WarningF])
+        , (["tracer2","bubble"], [CoSeverity WarningF])
+        ]
     , tcForwarder = LocalSocket "forwarder.log"
     , tcForwarderQueueSize = 100
     }

diff --git a/trace-dispatcher/examples/Examples/TestObjects.hs b/trace-dispatcher/examples/Examples/TestObjects.hs
@@ -149,8 +149,8 @@ instance LogFormatting (TraceForgeEvent LogBlock) where
     [IntM ["blockFromFuture"] (fromIntegral $ unSlotNo slot)]
 
 traceForgeEventDocu :: Documented (TraceForgeEvent LogBlock)
-traceForgeEventDocu = Documented [
-    DocMsg
+traceForgeEventDocu = Documented
+  [ DocMsg
       (TraceStartLeadershipCheck (SlotNo 1))
       []
       "Start of the leadership check\n\
@@ -210,36 +210,3 @@ message3 = TraceBlockFromFuture (SlotNo 4400) (SlotNo 300)
 
 message4 :: TraceForgeEvent LogBlock
 message4 = TraceStartLeadershipCheck (SlotNo 2002)
-
-
-
-  -- \(WithSeverity sev (Consensus.TraceLabelCreds creds event)) ->
-  --   case event of
-  --     Consensus.TraceStartLeadershipCheck slot -> do
-  --       !query <- mapNodeKernelDataIO
-  --                   (\nk ->
-  --                      (,,)
-  --                        <$> nkQueryLedger (ledgerUtxoSize . ledgerState) nk
-  --                        <*> nkQueryLedger (ledgerDelegMapSize . ledgerState) nk
-  --                        <*> nkQueryChain fragmentChainDensity nk)
-  --                   nodeKern
-  --       meta <- mkLOMeta sev Public
-  --       fromSMaybe (pure ()) $
-  --         query <&>
-  --           \(utxoSize, delegMapSize, _) -> do
-  --               traceCounter "utxoSize"     tr utxoSize
-  --               traceCounter "delegMapSize" tr delegMapSize
-  --       traceNamedObject (appendName "LeadershipCheck" tr)
-  --         ( meta
-  --         , LogStructured $ Map.fromList $
-  --           [("kind", String "TraceStartLeadershipCheck")
-  --           ,("credentials", String creds)
-  --           ,("slot", toJSON $ unSlotNo slot)]
-  --           ++ fromSMaybe []
-  --              (query <&>
-  --                \(utxoSize, delegMapSize, chainDensity) ->
-  --                  [ ("utxoSize",     toJSON utxoSize)
-  --                  , ("delegMapSize", toJSON delegMapSize)
-  --                  , ("chainDensity", toJSON (fromRational chainDensity :: Float))
-  --                  ])
-  --         )
diff --git a/trace-dispatcher/src/Cardano/Logging/Configuration.hs b/trace-dispatcher/src/Cardano/Logging/Configuration.hs
@@ -165,7 +165,7 @@ withNamespaceConfig name extract withConfig tr = do
         Left (_cmap, Just _v) ->
                       error $ "Trace not reset before reconfiguration (4)"
                                   ++ show (lcNamespace lc)
-    mkTrace ref (lc, Just dc@(Document {}), a) = do
+    mkTrace ref (lc, Just dc@Document {}, a) = do
       eitherConf <- liftIO $ readIORef ref
       case eitherConf of
         Right val -> do

diff --git a/trace-dispatcher/src/Cardano/Logging/Resources/Types.hs b/trace-dispatcher/src/Cardano/Logging/Resources/Types.hs
@@ -67,8 +67,8 @@ instance LogFormatting ResourceStats where
       , "Threads"       .= Number (fromIntegral $ rThreads rs)
       ]
 
-    asMetrics rs = [
-        IntM ["Stat","Cputicks"] (fromIntegral $ rCentiCpu rs)
+    asMetrics rs =
+      [ IntM ["Stat","Cputicks"] (fromIntegral $ rCentiCpu rs)
       , IntM ["Mem","Resident"] (fromIntegral $ rRSS rs)
       , IntM ["RTS","GcLiveBytes"] (fromIntegral $ rLive rs)
       , IntM ["RTS","GcMajorNum"] (fromIntegral $ rGcsMajor rs)