From 5d06f1ebc3b0ca8f6a287d2bf1c39c4cfb1fb89c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 14:28:05 -0400 Subject: [PATCH] protocol debug --- Propellor/Property/Docker.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 354d67c..32ce847 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