Merge pull request #3785 from input-output-hk/adiemand/DEVOPS-1109/inhibit-console-log

[DEVOPS-1109] cli argument to inhibit console log: --log-console-off

Author: CodiePP

lib/src/Pos/Client/CLI/Options.hs

@@ -38,6 +38,7 @@ import           Pos.Launcher.Configuration (ConfigurationOptions (..))
 data CommonArgs = CommonArgs
     { logConfig            :: !(Maybe FilePath)
     , logPrefix            :: !(Maybe FilePath)
+    , logConsoleOff        :: !Bool
     , reportServers        :: ![Text]
     , updateServers        :: ![Text]
     , configurationOptions :: !ConfigurationOptions
@@ -47,6 +48,7 @@ commonArgsParser :: Opt.Parser CommonArgs
 commonArgsParser = do
     logConfig <- optionalLogConfig
     logPrefix <- optionalLogPrefix
+    logConsoleOff <- optionalLogConsoleOff
     reportServers <- reportServersOption
     updateServers <- updateServersOption
     configurationOptions <- configurationOptionsParser
@@ -114,9 +116,15 @@ optionalLogConfig =
 
 optionalLogPrefix :: Opt.Parser (Maybe String)
 optionalLogPrefix =
-    optional $ Opt.strOption $
+    Opt.optional $ Opt.strOption $
         templateParser "logs-prefix" "FILEPATH" "Prefix to logger output path."
 
+optionalLogConsoleOff :: Opt.Parser Bool
+optionalLogConsoleOff =
+    Opt.switch $
+        Opt.long "log-console-off" <>
+        Opt.help "Inhibit logging to the console."
+
 optionalJSONPath :: Opt.Parser (Maybe FilePath)
 optionalJSONPath =
     Opt.optional $ Opt.strOption $

lib/src/Pos/Client/CLI/Params.hs

@@ -38,7 +38,7 @@ loggingParams defaultName CommonNodeArgs{..} =
     { lpHandlerPrefix = logPrefix commonArgs
     , lpConfigPath    = logConfig commonArgs
     , lpDefaultName   = defaultName
-    , lpConsoleLog    = Nothing -- no override by default
+    , lpConsoleLog    = Just (not $ logConsoleOff commonArgs)
     }
 
 getBaseParams :: LoggerName -> CommonNodeArgs -> BaseParams

tools/src/dbgen/Main.hs

@@ -94,6 +94,7 @@ newRealModeContext genesisConfig txpConfig dbs confOpts publicKeyPath secretKeyP
          , commonArgs             = CommonArgs {
                logConfig            = Nothing
              , logPrefix            = Nothing
+             , logConsoleOff        = True
              , reportServers        = mempty
              , updateServers        = mempty
              , configurationOptions = confOpts

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

@@ -97,7 +97,6 @@ mkFileScribe rot sevfilter fdesc formatter colorize s v = do
                   let tdiff' = round $ diffUTCTime rottime (_itemTime item)
                   if bytes' < 0 || tdiff' < (0 :: Integer)
                      then do   -- log file rotation
-                        putStrLn $ "rotate! bytes=" ++ (show bytes') ++ " tdiff=" ++ (show tdiff')
                         hClose hdl
                         (hdl2, bytes2, rottime2) <- evalRotator rot fdesc
                         return (hdl2, bytes2, rottime2)