From 626a2dd020375394f4d44b618b7fe4f07ddf44c1 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 12 Nov 2021 00:58:21 +0100 Subject: [PATCH] More debug logging --- lib/GHCup.hs | 1 + lib/GHCup/Utils.hs | 1 + lib/GHCup/Utils/File/Posix.hs | 2 ++ lib/GHCup/Utils/File/Windows.hs | 2 ++ 4 files changed, 6 insertions(+) diff --git a/lib/GHCup.hs b/lib/GHCup.hs index 530e53a..4ab43a6 100644 --- a/lib/GHCup.hs +++ b/lib/GHCup.hs @@ -2500,6 +2500,7 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patchdir aargs buildFlavour had execWithGhcEnv :: ( MonadReader env m , HasSettings env , HasDirs env + , HasLog env , MonadIO m , MonadThrow m) => FilePath -- ^ thing to execute diff --git a/lib/GHCup/Utils.hs b/lib/GHCup/Utils.hs index dab1789..489e856 100644 --- a/lib/GHCup/Utils.hs +++ b/lib/GHCup/Utils.hs @@ -856,6 +856,7 @@ make :: ( MonadThrow m , MonadIO m , MonadReader env m , HasDirs env + , HasLog env , HasSettings env ) => [String] diff --git a/lib/GHCup/Utils/File/Posix.hs b/lib/GHCup/Utils/File/Posix.hs index fdd788b..b13aec9 100644 --- a/lib/GHCup/Utils/File/Posix.hs +++ b/lib/GHCup/Utils/File/Posix.hs @@ -73,6 +73,7 @@ executeOut path args chdir = liftIO $ captureOutStreams $ do execLogged :: ( MonadReader env m , HasSettings env + , HasLog env , HasDirs env , MonadIO m , MonadThrow m) @@ -85,6 +86,7 @@ execLogged :: ( MonadReader env m execLogged exe args chdir lfile env = do Settings {..} <- getSettings Dirs {..} <- getDirs + logDebug $ T.pack $ "Running " <> exe <> " with arguments " <> show args let logfile = logsDir lfile <> ".log" liftIO $ bracket (openFd logfile WriteOnly (Just newFilePerms) defaultFileFlags{ append = True }) closeFd diff --git a/lib/GHCup/Utils/File/Windows.hs b/lib/GHCup/Utils/File/Windows.hs index b7b6e17..91ec2d7 100644 --- a/lib/GHCup/Utils/File/Windows.hs +++ b/lib/GHCup/Utils/File/Windows.hs @@ -149,6 +149,7 @@ executeOut path args chdir = do execLogged :: ( MonadReader env m , HasDirs env + , HasLog env , HasSettings env , MonadIO m , MonadThrow m) @@ -160,6 +161,7 @@ execLogged :: ( MonadReader env m -> m (Either ProcessError ()) execLogged exe args chdir lfile env = do Dirs {..} <- getDirs + logDebug $ T.pack $ "Running " <> exe <> " with arguments " <> show args let stdoutLogfile = logsDir lfile <> ".stdout.log" stderrLogfile = logsDir lfile <> ".stderr.log" cp <- createProcessWithMingwPath ((proc exe args)