diff options
author | 2012-07-19 00:43:36 -0400 | |
---|---|---|
committer | 2012-07-19 00:46:52 -0400 | |
commit | 1db7d27a451f552dbae8760e83c73b90da8114d5 (patch) | |
tree | 69beba839e2c996658133679c6aca3be40b4f9f6 /Command/Map.hs | |
parent | 549f8619998eab17aaf2122f11f036fac7e6cc40 (diff) |
add back debug logging
Make Utility.Process wrap the parts of System.Process that I use,
and add debug logging to them.
Also wrote some higher-level code that allows running an action
with handles to a processes stdin or stdout (or both), and checking
its exit status, all in a single function call.
As a bonus, the debug logging now indicates whether the process
is being run to read from it, feed it data, chat with it (writing and
reading), or just call it for its side effect.
Diffstat (limited to 'Command/Map.hs')
-rw-r--r-- | Command/Map.hs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Command/Map.hs b/Command/Map.hs index f69b88a5d..3dbdadbd6 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -9,7 +9,6 @@ module Command.Map where import Control.Exception.Extensible import qualified Data.Map as M -import System.Process import Common.Annex import Command @@ -199,13 +198,11 @@ tryScan r case result of Left _ -> return Nothing Right r' -> return $ Just r' - pipedconfig cmd params = safely $ do - (_, Just h, _, pid) <- - createProcess (proc cmd $ toCommand params) - { std_out = CreatePipe } - r' <- Git.Config.hRead r h - forceSuccessProcess pid cmd $ toCommand params - return r' + pipedconfig cmd params = safely $ + withHandle StdoutHandle createProcessSuccess p $ + Git.Config.hRead r + where + p = proc cmd $ toCommand params configlist = onRemote r (pipedconfig, Nothing) "configlist" [] [] |