[GH-345] Added the logsPrefix from configuration.

Author: ksaric

cardano-launcher/app/Main.hs

@@ -105,27 +105,7 @@ main = silence $ do
                         -- Otherwise run the real deal, the real function.
                         runDefaultUpdateProcess filePath arguments
 
-
-    -- the log output path (TODO: get base path from configuration)
-    logfilepath <- pure "Logs/launcher"
-
     logConfig           <- defaultConfigStdout
-    scribes0 <- CM.getSetupScribes logConfig
-    CM.setSetupScribes logConfig $ scribes0 <>
-        [ScribeDefinition {
-            scName = logfilepath,
-            scFormat = ScText,
-            scKind = FileSK,
-            scPrivacy = ScPublic,
-            scRotation = Just $ RotationParameters
-              {
-                  rpLogLimitBytes = 10000000,
-                  rpMaxAgeHours = 24,
-                  rpKeepFilesNum = 3
-              }
-        }]
-    CM.setDefaultScribes logConfig [ "StdoutSK::text"
-                                   , "FileSK::" <> logfilepath ]
 
     -- A safer way to close the tracing.
     withTrace logConfig "launcher" $ \baseTrace -> do
@@ -151,6 +131,26 @@ main = silence $ do
                     throwM $ LauncherOptionsError (show err)
                 Right lo -> pure lo
 
+        -- the log output path (TODO: get base path from configuration)
+        let logfilepath = lologsPrefix launcherOptions <> "Logs/launcher"
+
+        scribes0 <- CM.getSetupScribes logConfig
+        CM.setSetupScribes logConfig $ scribes0 <>
+            [ScribeDefinition {
+                scName = toS logfilepath,
+                scFormat = ScText,
+                scKind = FileSK,
+                scPrivacy = ScPublic,
+                scRotation = Just $ RotationParameters
+                  {
+                      rpLogLimitBytes = 10000000,
+                      rpMaxAgeHours = 24,
+                      rpKeepFilesNum = 3
+                  }
+            }]
+        CM.setDefaultScribes logConfig [ "StdoutSK::text"
+                                       , "FileSK::" <> toS logfilepath ]
+
         let lockFile = loStateDir launcherOptions <> "/daedalus_lockfile"
         Trace.logNotice baseTrace $ "Locking file so that multiple applications won't run at same time"
         -- Check if it's locked or not. Will throw an exception if the

cardano-launcher/src/Cardano/Shell/Configuration.hs

@@ -50,6 +50,7 @@ data LauncherOptions = LauncherOptions
     , loWorkingDirectory    :: !FilePath
     , loStateDir            :: !FilePath
     -- On WIN it should set this directory as current.
+    , lologsPrefix          :: !FilePath
     } deriving (Show, Generic)
 
 instance FromJSON LauncherOptions where
@@ -63,6 +64,7 @@ instance FromJSON LauncherOptions where
         tlsPath             <- o .:? "tlsPath"
         workingDir          <- o .: "workingDir"
         stateDir            <- o .: "stateDir"
+        logsPrefix          <- o .: "logsPrefix"
 
         pure $ LauncherOptions
             configuration
@@ -73,6 +75,7 @@ instance FromJSON LauncherOptions where
             daedalusBin
             workingDir
             stateDir
+            logsPrefix
 
 -- | Configuration yaml file location and the key to use. The file should
 -- parse to a MultiConfiguration and the 'cfoKey' should be one of the keys