cardano-tracer: align formatting

IntersectMBO · May 30, 2023 · 2c18d78 · 2c18d78
1 parent 15f1665
commit 2c18d78
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 47 deletions.
diff --git a/cardano-tracer/src/Cardano/Tracer/Handlers/Logs/File.hs b/cardano-tracer/src/Cardano/Tracer/Handlers/Logs/File.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Tracer.Handlers.Logs.File
@@ -9,15 +8,10 @@ module Cardano.Tracer.Handlers.Logs.File
 import           Control.Concurrent.Extra (Lock, withLock)
 import           Control.Monad (unless)
 import           Control.Monad.Extra (ifM)
-import           Data.Aeson (Value, decodeStrict', pairs, (.=))
-import           Data.Aeson.Encoding (encodingToLazyByteString)
 import qualified Data.ByteString as BS
-import qualified Data.ByteString.Lazy as LBS
-import           Data.Char (isDigit)
 import           Data.Maybe (mapMaybe)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as TE
-import           Data.Time.Format (defaultTimeLocale, formatTime)
 import           System.Directory (createDirectoryIfMissing, doesDirectoryExist, makeAbsolute)
 import           System.Directory.Extra (listFiles)
 import           System.FilePath ((</>))
@@ -90,38 +84,12 @@ getPathToCurrentlog nodeName rootDirAbs format =
     createEmptyLog subDirForLogs format
 
 traceObjectToText :: TraceObject -> Maybe T.Text
-traceObjectToText TraceObject{toHuman, toHostname, toNamespace, toSeverity, toThreadId, toTimestamp} =
+traceObjectToText TraceObject{toHuman} =
   case toHuman of
     Nothing -> Nothing
-    Just msgForHuman -> Just $
-      "[" <> host <> ":" <> name <> ":" <> sev <> ":" <> thId <> "] [" <> time <> "] "
-      <> msgForHuman <> nl
- where
-  host = T.pack toHostname
-  name = mkName toNamespace
-  sev  = T.pack $ show toSeverity
-  thId = T.filter isDigit toThreadId
-  time = T.pack $ formatTime defaultTimeLocale "%F %T%2Q %Z" toTimestamp
-
-mkName :: [T.Text] -> T.Text
-mkName []    = "noname"
-mkName l = T.intercalate "." l
+    Just msgForHuman -> Just $ msgForHuman <> nl
 
 traceObjectToJSON :: TraceObject -> Maybe T.Text
-traceObjectToJSON TraceObject{toMachine, toTimestamp, toNamespace, toHostname, toSeverity, toThreadId} =
-  case toMachine of
-    Nothing  -> Nothing
-    Just msg -> Just $ toAsJSON msg <> nl
- where
-  toAsJSON msgForMachine =
-      TE.decodeUtf8
-    . LBS.toStrict
-    . encodingToLazyByteString
-    . pairs $ "at"     .= formatTime defaultTimeLocale "%F %H:%M:%S%4QZ" toTimestamp
-           <> "ns"     .= mkName toNamespace
-           <> "data"   .= case decodeStrict' $ TE.encodeUtf8 msgForMachine of
-                            Just (v :: Value) -> v
-                            Nothing -> ""
-           <> "sev"    .= T.pack (show toSeverity)
-           <> "thread" .= T.filter isDigit toThreadId
-           <> "host"   .= T.pack toHostname
+traceObjectToJSON TraceObject{toMachine} =
+  Just $ toMachine <> nl
+
diff --git a/cardano-tracer/src/Cardano/Tracer/Handlers/Logs/Journal.hs b/cardano-tracer/src/Cardano/Tracer/Handlers/Logs/Journal.hs
@@ -39,10 +39,8 @@ writeTraceObjectsToJournal nodeName = mapM_ (sendJournalFields . mkJournalFields
  where
   mkJournalFields trOb@TraceObject{toHuman, toMachine} =
     case (toHuman, toMachine) of
-      (Just msgForHuman, Nothing)            -> mkJournalFields' trOb msgForHuman
-      (Nothing,          Just msgForMachine) -> mkJournalFields' trOb msgForMachine
-      (Just _,           Just msgForMachine) -> mkJournalFields' trOb msgForMachine
-      (Nothing,          Nothing)            -> HM.empty
+      (Nothing,          msgForMachine) -> mkJournalFields' trOb msgForMachine
+      (Just _,           msgForMachine) -> mkJournalFields' trOb msgForMachine
 
   mkJournalFields' TraceObject{toSeverity, toNamespace, toThreadId, toTimestamp} msg =
        syslogIdentifier nodeName

diff --git a/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/Notifications/Types.hs b/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/Notifications/Types.hs
@@ -66,7 +66,7 @@ data Event = Event
 -- | The queue for events we should notify about.
 type EventsQueue = TBQueue Event
 
-data EventGroup 
+data EventGroup
   -- Common problems
   = EventWarnings
   | EventErrors

diff --git a/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/State/TraceObjects.hs b/cardano-tracer/src/Cardano/Tracer/Handlers/RTView/State/TraceObjects.hs
@@ -63,10 +63,7 @@ saveTraceObjects savedTraceObjects nodeId traceObjects =
   getTOValue TraceObject{toNamespace, toHuman, toMachine, toSeverity, toTimestamp} =
     case (toNamespace, toHuman, toMachine) of
       ([], _,        _)        -> Nothing
-      (ns, Just msg, Nothing)  -> Just (mkName ns, (msg, toSeverity, toTimestamp))
-      (ns, Nothing,  Just msg) -> Just (mkName ns, (msg, toSeverity, toTimestamp))
-      (ns, Just msg, Just _)   -> Just (mkName ns, (msg, toSeverity, toTimestamp))
-      _                        -> Nothing
+      (ns, _, msg)   -> Just (mkName ns, (msg, toSeverity, toTimestamp))
 
   mkName = intercalate "."
 
@@ -80,7 +77,7 @@ getTraceObjects savedTraceObjects nodeId = atomically $ do
   qForThisNode <- M.lookup nodeId <$> readTVar savedTraceObjects
   maybe (return []) flushTQueue qForThisNode
 
--- | Counters for displayed logs item in "live view window". 
+-- | Counters for displayed logs item in "live view window".
 type LogsLiveViewCounters = TVar (Map NodeId Int)
 
 initLogsLiveViewCounters :: IO LogsLiveViewCounters