Merge #76

76: rename block count to blockNum r=disassembler a=avieth

More consistent with cardano-node

Co-authored-by: Alexander Vieth <[email protected]>
Co-authored-by: Samuel Leathers <[email protected]>

Author: 3 people

cfg/logging.yaml

@@ -40,5 +40,5 @@ options:
     '#messagecounters.katip':
       subtrace: NoTrace
   mapBackends:
-    'byron-proxy.db.block count':
+    'cardano_byron_proxy.ChainDB.blockNum':
       - EKGViewBK

src/exec/Main.hs

@@ -543,7 +543,7 @@ defineSeverity it = case it of
 main :: IO ()
 main = do
   bpo <- Opt.execParser cliParserInfo
-  Logging.withLogging (bpoLoggerConfigPath bpo) "byron-proxy" $ \trace -> do
+  Logging.withLogging (bpoLoggerConfigPath bpo) "cardano_byron_proxy" $ \trace -> do
     -- We always need the cardano-sl configuration, even if we're not
     -- connecting to a Byron peer, because that's where the blockchain
     -- configuration comes from: slots-per-epoch in particular.
@@ -616,10 +616,10 @@ main = do
                   -- NB this is here because devops wanted an EKG metric on
                   -- block count. FIXME should be done in a more sane way...
                   let val  = Monitoring.PureI (fromIntegral blockno)
-                      item = ("db", Monitoring.Info, Monitoring.LogValue "block count" val)
+                      item = ("ChainDB", Monitoring.Info, Monitoring.LogValue "blockNum" val)
                   in  doConvertedTrace item
               TraceAddBlockEvent (AddBlockValidation it@(InvalidBlock _ _)) ->
-                  let val = ("db", Monitoring.Error, Monitoring.LogMessage (fromString (show it)))
+                  let val = ("ChainDB", Monitoring.Error, Monitoring.LogMessage (fromString (show it)))
                   in  doConvertedTrace val
               _ -> pure ()
             indexTracer :: Tracer IO Index.TraceEvent