[CBR-275] modifyLoggerName reqs 'dot' when adding name to context

Signed-off-by: Alexander Diemand <[email protected]>

Author: CodiePP

.gitignore

@@ -5,6 +5,10 @@
 # From daedalus-bridge
 node_modules/*
 
+# tags
+*.tags
+tags
+
 # Config files
 .ghci
 

db/src/Pos/DB/Update/Logic/Global.hs

@@ -79,7 +79,7 @@ type USGlobalApplyMode ctx m =
 ----------------------------------------------------------------------------
 
 withUSLogger :: WithLogger m => m a -> m a
-withUSLogger = modifyLoggerName (<> "us")
+withUSLogger = modifyLoggerName (<> ".us")
 
 -- | Apply chain of /definitely/ valid blocks to US part of GState DB
 -- and to US local data. This function assumes that no other thread

explorer/src/Pos/Explorer/Socket/App.hs

@@ -228,7 +228,7 @@ notifierApp
     -> NotifierSettings
     -> m ()
 notifierApp genesisConfig settings =
-    modifyLoggerName (<> "notifier.socket-io") $ do
+    modifyLoggerName (<> ".notifier.socket-io") $ do
         logInfo "Starting"
         connVar <- liftIO $ STM.newTVarIO mkConnectionsState
         withAsync (periodicPollChanges genesisConfig connVar)

infra/src/Pos/Infra/Slotting/Util.hs

@@ -189,13 +189,13 @@ onNewSlotDo epochSlots withLogging expectedSlotId onsp action = do
     shortDelay = 42
     recoveryRefreshDelay :: Millisecond
     recoveryRefreshDelay = 150
-    logTTW timeToWait = modifyLoggerName (<> "slotting") $ logDebug $
+    logTTW timeToWait = modifyLoggerName (<> ".slotting") $ logDebug $
                  sformat ("Waiting for "%shown%" before new slot") timeToWait
 
 logNewSlotWorker :: MonadOnNewSlot ctx m => SlotCount -> m ()
 logNewSlotWorker epochSlots =
     onNewSlotWithLogging epochSlots defaultOnNewSlotParams $ \slotId -> do
-        modifyLoggerName (<> "slotting") $
+        modifyLoggerName (<> ".slotting") $
             logNotice $ sformat ("New slot has just started: " %slotIdF) slotId
 
 -- | Wait until system starts. This function is useful if node is

lib/bench/Bench/Pos/Diffusion/BlockDownload.hs

@@ -21,7 +21,6 @@ import qualified Criterion.Main.Options as Criterion
 import qualified Data.ByteString.Lazy as LBS
 import           Data.Conduit.Combinators (yieldMany)
 import           Data.List.NonEmpty (NonEmpty ((:|)))
-import           Data.Semigroup ((<>))
 import qualified Options.Applicative as Opt (execParser)
 
 import qualified Network.Broadcast.OutboundQueue as OQ
@@ -124,7 +123,7 @@ withServer transport logic k = do
     -- Morally, the server shouldn't need an outbound queue, but we have to
     -- give one.
     oq <- liftIO $ OQ.new
-                 (wlogTrace ("server" <> "outboundqueue"))
+                 (wlogTrace ("server.outboundqueue"))
                  Policy.defaultEnqueuePolicyRelay
                  --Policy.defaultDequeuePolicyRelay
                  (const (OQ.Dequeue OQ.NoRateLimiting (OQ.MaxInFlight maxBound)))
@@ -152,7 +151,7 @@ withServer transport logic k = do
         , fdcLastKnownBlockVersion = blockVersion
         , fdcConvEstablishTimeout = 15000000 -- us
         , fdcStreamWindow = 65536
-        , fdcTrace = wlogTrace ("server" <> "diffusion")
+        , fdcTrace = wlogTrace ("server.diffusion")
         }
 
 -- Like 'withServer' but we must set up the outbound queue so that it will
@@ -167,7 +166,7 @@ withClient transport logic serverAddress@(Node.NodeId _) k = do
     -- Morally, the server shouldn't need an outbound queue, but we have to
     -- give one.
     oq <- OQ.new
-                 (wlogTrace ("client" <> "outboundqueue"))
+                 (wlogTrace ("client.outboundqueue"))
                  Policy.defaultEnqueuePolicyRelay
                  --Policy.defaultDequeuePolicyRelay
                  (const (OQ.Dequeue OQ.NoRateLimiting (OQ.MaxInFlight maxBound)))
@@ -197,7 +196,7 @@ withClient transport logic serverAddress@(Node.NodeId _) k = do
         , fdcLastKnownBlockVersion = blockVersion
         , fdcConvEstablishTimeout = 15000000 -- us
         , fdcStreamWindow = 65536
-        , fdcTrace = wlogTrace ("client" <> "diffusion")
+        , fdcTrace = wlogTrace ("client.diffusion")
         }
 
 

lib/src/Pos/Diffusion/Full.hs

@@ -128,7 +128,7 @@ diffusionLayerFull fdconf networkConfig mEkgNodeMetrics mkLogic k = do
     oq :: OQ.OutboundQ EnqueuedConversation NodeId Bucket <-
         -- NB: <> it's not Text semigroup append, it's LoggerName append, which
         -- puts a "." in the middle.
-        initQueue networkConfig ("diffusion" <> "outboundqueue") (enmStore <$> mEkgNodeMetrics)
+        initQueue networkConfig ("diffusion.outboundqueue") (enmStore <$> mEkgNodeMetrics)
     let topology = ncTopology networkConfig
         mSubscriptionWorker = topologySubscriptionWorker topology
         mSubscribers = topologySubscribers topology

lib/test/Test/Pos/Diffusion/BlockSpec.hs

@@ -122,7 +122,7 @@ clientLogic = pureLogic
 
 withServer :: Transport -> Logic IO -> (NodeId -> IO t) -> IO t
 withServer transport logic k = do
-    logTrace <- liftIO $ wsetupLogging (defaultTestConfiguration Debug) ("server" <> "outboundqueue")
+    logTrace <- liftIO $ wsetupLogging (defaultTestConfiguration Debug) ("server.outboundqueue")
     -- Morally, the server shouldn't need an outbound queue, but we have to
     -- give one.
     oq <- liftIO $ OQ.new
@@ -154,7 +154,7 @@ withServer transport logic k = do
         , fdcLastKnownBlockVersion = blockVersion
         , fdcConvEstablishTimeout = 15000000 -- us
         , fdcStreamWindow = 2048
-        , fdcTrace = wlogTrace ("server" <> "diffusion")
+        , fdcTrace = wlogTrace ("server.diffusion")
         }
 
 -- Like 'withServer' but we must set up the outbound queue so that it will
@@ -170,7 +170,7 @@ withClient streamWindow transport logic serverAddress@(Node.NodeId _) k = do
     -- Morally, the server shouldn't need an outbound queue, but we have to
     -- give one.
     oq <- OQ.new
-                 (wlogTrace ("client" <> "outboundqueue"))
+                 (wlogTrace ("client.outboundqueue"))
                  Policy.defaultEnqueuePolicyRelay
                  --Policy.defaultDequeuePolicyRelay
                  (const (OQ.Dequeue OQ.NoRateLimiting (OQ.MaxInFlight maxBound)))
@@ -200,7 +200,7 @@ withClient streamWindow transport logic serverAddress@(Node.NodeId _) k = do
         , fdcLastKnownBlockVersion = blockVersion
         , fdcConvEstablishTimeout = 15000000 -- us
         , fdcStreamWindow = streamWindow
-        , fdcTrace = wlogTrace ("client" <> "diffusion")
+        , fdcTrace = wlogTrace ("client.diffusion")
         }
 
 

networking/test/Test/NodeSpec.hs

@@ -46,7 +46,7 @@ import           Test.Util (HeavyParcel (..), Parcel (..), Payload (..),
 spec :: Spec
 spec = describe "Node" $ modifyMaxSuccess (const 50) $ do
 
-    logTrace <- runIO $ wsetupLogging (defaultTestConfiguration Debug) ""
+    logTrace <- runIO $ wsetupLogging (defaultTestConfiguration Debug) "nodespec"
 
         -- Take at most 25000 bytes for each Received message.
         -- We want to ensure that the MTU works, but not make the tests too

util/src/Pos/Util/Log/Rotator.hs

@@ -124,13 +124,11 @@ cleanupRotator rotation fdesc = do
     removeOldFiles :: Int -> Maybe (NonEmpty FilePath) -> IO ()
     removeOldFiles _ Nothing = return ()
     removeOldFiles n (Just flist) = do
-        putStrLn $ "dropping " ++ (show n) ++ " from " ++ (show flist)
         removeFiles $ reverse $ NE.drop n $ NE.reverse flist
     removeFiles [] = return ()
     removeFiles (fp : fps) = do
         let bp = prefixpath fdesc
             filepath = bp </> fp
-        putStrLn $ "removing file " ++ filepath
         removeFile filepath   -- destructive
         removeFiles fps
 

util/src/Pos/Util/Wlog/Compatibility.hs

@@ -230,9 +230,8 @@ loggingHandler = unsafePerformIO $ do
 --   the backends (scribes) will be registered with katip
 setupLogging :: MonadIO m => LoggerConfig -> m ()
 setupLogging lc = liftIO $
-                    modifyMVar_ loggingHandler $ const $ Log.setupLogging lc
+    modifyMVar_ loggingHandler $ const $ Log.setupLogging lc
 
--- LogSafe
 
 -- | Whether to log to given log handler.
 type SelectionMode = LogSecurityLevel -> Bool

util/test/Test/Pos/Util/WlogSpec.hs

@@ -14,8 +14,15 @@ import           Pos.Util.Wlog
 someLogging :: IO ()
 someLogging = do
     setupLogging loggerConfig
+    -- context: cardano-sl.testing
     usingLoggerName "testing" $ do
         testLog
+        -- context: cardano-sl.testing.more
+        modifyLoggerName (<> ".more") $ do
+            testLog
+            -- context: cardano-sl.final
+            modifyLoggerName (const "final") $ do
+                testLog
   where
     loggerConfig :: LoggerConfig
     loggerConfig = defaultInteractiveConfiguration Debug
@@ -30,7 +37,7 @@ testLog = do
 
 spec :: Spec
 spec = describe "Logging" $ do
-    modifyMaxSuccess (const 2) $ modifyMaxSize (const 2) $
+    modifyMaxSuccess (const 1) $ modifyMaxSize (const 1) $
       it "demonstrate logging" $
         monadicIO $ lift $ someLogging
 

wallet/src/Pos/Wallet/Web/Pending/Worker.hs

@@ -205,6 +205,6 @@ startPendingTxsResubmitter genesisConfig txpConfig db submitTx =
         onsp
         (processPtxsOnSlot genesisConfig txpConfig db submitTx)
   where
-    setLogger = modifyLoggerName (<> "tx" <> "resubmitter")
+    setLogger = modifyLoggerName (<> ".tx" <> ".resubmitter")
     onsp :: OnNewSlotParams
     onsp = defaultOnNewSlotParams { onspStartImmediately = False }