summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-01 14:28:05 -0400
committerJoey Hess2014-04-01 14:28:05 -0400
commit5d06f1ebc3b0ca8f6a287d2bf1c39c4cfb1fb89c (patch)
tree08ab6c413bfc56436d4a69f4733f2e0b00dd5694 /Propellor/Property
parent50f68604e1a3eabe7304bc62ab46fcdac41bfdb1 (diff)
protocol debug
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Docker.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 354d67cc..32ce847d 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -189,16 +189,18 @@ chain s = case readish s of
-- 1 minute.
provisionContainer :: ContainerId -> Property
provisionContainer cid = containerDesc cid $ Property "provision" $
- simpleShClientRetry 60 (namedPipe cid) "./propellor" ["--continue", show params] (go Nothing)
+ simpleShClientRetry 60 (namedPipe cid) "./propellor" params (go Nothing)
where
- params = Chain $ fromContainerId cid
+ params = ["--continue", show $ Chain $ fromContainerId cid]
go lastline (v:rest) = case v of
StdoutLine s -> do
+ debug ["stdout: ", s]
maybe noop putStrLn lastline
hFlush stdout
go (Just s) rest
StderrLine s -> do
+ debug ["stderr: ", s]
maybe noop putStrLn lastline
hFlush stdout
hPutStrLn stderr s