diff options
| author | Joey Hess <joey@kitenet.net> | 2014-05-14 19:34:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-14 19:34:26 -0400 |
| commit | 5a5adab86788d93103803df27a1004d0d9696b1d (patch) | |
| tree | 4ebf8c49ff97fbd2b35d06eaced0b4794a17cc31 /Propellor/Property | |
| parent | ffce1f80ae3c492fe768666a00df396448ad6368 (diff) | |
remove simplsh debug code
Seems I have really fixed that bug!
Diffstat (limited to 'Propellor/Property')
| -rw-r--r-- | Propellor/Property/Docker.hs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 6757c7cc..09d7d6a4 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -335,29 +335,19 @@ provisionContainer cid = containerDesc cid $ property "provision" $ liftIO $ do go lastline (v:rest) = case v of StdoutLine s -> do - debug ["stdout: ", show s] maybe noop putStrLn lastline hFlush stdout go (Just s) rest StderrLine s -> do - debug ["stderr: ", show s] maybe noop putStrLn lastline hFlush stdout hPutStrLn stderr s hFlush stderr go Nothing rest - Done -> do - debug ["reached Done"] - ret lastline - go lastline [] = do - debug ["reached end of output"] - ret lastline + Done -> ret lastline + go lastline [] = ret lastline - ret lastline = do - let v = fromMaybe FailedChange $ - readish =<< lastline - debug ["provisionContainer returning", show v] - return v + ret lastline = pure $ fromMaybe FailedChange $ readish =<< lastline stopContainer :: ContainerId -> IO Bool stopContainer cid = boolSystem dockercmd [Param "stop", Param $ fromContainerId cid ] |
