Add some debug logging

mgsloan · mgsloan · commit 24cb433eb0a5 · 2016-03-08T22:33:44.000-08:00
This logging helps clarify the invocations that stack makes
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -310,7 +310,11 @@ getDefaultGHCVariant
     :: (MonadIO m, MonadBaseControl IO m, MonadCatch m, MonadLogger m)
     => EnvOverride -> Platform -> m GHCVariant
 getDefaultGHCVariant menv (Platform _ Linux) = do
+    $logDebug "Checking whether stack was built with libgmp4"
     isGMP4 <- getIsGMP4 menv
+    if isGMP4
+        then $logDebug "Stack was build with libgmp4, so the default ghc-variant will be gmp4"
+        else $logDebug "Stack was not build with libgmp4"
     return (if isGMP4 then GHCGMP4 else GHCStandard)
 getDefaultGHCVariant _ _ = return GHCStandard
 
diff --git a/src/Stack/GhcPkg.hs b/src/Stack/GhcPkg.hs
@@ -45,6 +45,7 @@ import           System.Process.Read
 getGlobalDB :: (MonadIO m, MonadLogger m, MonadBaseControl IO m, MonadCatch m)
             => EnvOverride -> WhichCompiler -> m (Path Abs Dir)
 getGlobalDB menv wc = do
+    $logDebug "Getting global package database location"
     -- This seems like a strange way to get the global package database
     -- location, but I don't know of a better one
     bs <- ghcPkg menv wc [] ["list", "--global"] >>= either throwM return
@@ -160,13 +161,14 @@ unregisterGhcPkgId menv wc cv pkgDb gid ident = do
 -- | Get the version of Cabal from the global package database.
 getCabalPkgVer :: (MonadThrow m, MonadIO m, MonadLogger m, MonadBaseControl IO m, MonadCatch m)
                => EnvOverride -> WhichCompiler -> m Version
-getCabalPkgVer menv wc =
-    findGhcPkgVersion
+getCabalPkgVer menv wc = do
+    $logDebug "Getting Cabal package version"
+    mres <- findGhcPkgVersion
         menv
         wc
         [] -- global DB
-        cabalPackageName >>=
-        maybe (throwM $ Couldn'tFindPkgId cabalPackageName) return
+        cabalPackageName
+    maybe (throwM $ Couldn'tFindPkgId cabalPackageName) return mres
 
 -- | Get the value for GHC_PACKAGE_PATH
 mkGhcPackagePath :: Bool -> Path Abs Dir -> Path Abs Dir -> [Path Abs Dir] -> Path Abs Dir -> Text
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -220,6 +220,7 @@ setupEnv mResolveMissingGHC = do
     menv <- mkEnvOverride platform env
     compilerVer <- getCompilerVersion menv wc
     cabalVer <- getCabalPkgVer menv wc
+    $logDebug "Resolving package entries"
     packages <- mapM
         (resolvePackageEntry menv (bcRoot bconfig))
         (bcPackageEntries bconfig)
@@ -330,7 +331,9 @@ ensureCompiler sopts = do
 
     msystem <-
         if soptsUseSystem sopts
-            then getSystemCompiler menv0 wc
+            then do
+                $logDebug "Getting system compiler version"
+                getSystemCompiler menv0 wc
             else return Nothing
 
     Platform expectedArch _ <- asks getPlatform
diff --git a/src/Stack/Setup/Installed.hs b/src/Stack/Setup/Installed.hs
@@ -88,10 +88,12 @@ getCompilerVersion :: (MonadLogger m, MonadCatch m, MonadBaseControl IO m, Monad
 getCompilerVersion menv wc =
     case wc of
         Ghc -> do
+            $logDebug "Asking GHC for its version"
             bs <- readProcessStdout Nothing menv "ghc" ["--numeric-version"]
             let (_, ghcVersion) = versionFromEnd bs
             GhcVersion <$> parseVersion (T.decodeUtf8 ghcVersion)
         Ghcjs -> do
+            $logDebug "Asking GHCJS for its version"
             -- Output looks like
             --
             -- The Glorious Glasgow Haskell Compilation System for JavaScript, version 0.1.0 (GHC 7.10.2)
