summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2015-01-05 19:42:59 -0400
committerJoey Hess2015-01-05 19:42:59 -0400
commitbd7c118caea362005c7dbdea5d6fd3da1d98fe9a (patch)
treeba0c370864b9ce1120dd9108374bc688caeb3b87 /src/Propellor
parent208322d5bef587c8978abbac263012c441e60244 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Protocol.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Propellor/Protocol.hs b/src/Propellor/Protocol.hs
index 940f3e67..b6d38d06 100644
--- a/src/Propellor/Protocol.hs
+++ b/src/Propellor/Protocol.hs
@@ -42,6 +42,10 @@ fromMarked marker s
sendMarked :: Handle -> Marker -> String -> IO ()
sendMarked h marker s = do
debug ["sent marked", marker]
+ sendMarked' h marker s
+
+sendMarked' :: Handle -> Marker -> String -> IO ()
+sendMarked' h marker s = do
-- Prefix string with newline because sometimes a
-- incomplete line has been output, and the marker needs to
-- come at the start of a line.
@@ -63,5 +67,6 @@ getMarked h marker = go =<< catchMaybeIO (hGetLine h)
req :: Stage -> Marker -> (String -> IO ()) -> IO ()
req stage marker a = do
- sendMarked stdout statusMarker (show stage)
+ debug ["requested marked", marker]
+ sendMarked' stdout statusMarker (show stage)
maybe noop a =<< getMarked stdin marker