cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-01-05 19:43:38 -04:00
parent 0235e88ea2 bd7c118cae
commit 16031a7c26
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Propellor/Protocol.hs
View File

@ -41,6 +41,11 @@ fromMarked marker s
sendMarked :: Handle -> Marker -> String -> IO () sendMarked :: Handle -> Marker -> String -> IO ()
sendMarked h marker s = do 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 -- Prefix string with newline because sometimes a
-- incomplete line has been output, and the marker needs to -- incomplete line has been output, and the marker needs to
-- come at the start of a line. -- come at the start of a line.
@ -56,9 +61,12 @@ getMarked h marker = go =<< catchMaybeIO (hGetLine h)
unless (null l) $ unless (null l) $
hPutStrLn stderr l hPutStrLn stderr l
getMarked h marker getMarked h marker
Just v -> return (Just v) Just v -> do
debug ["received marked", marker]
return (Just v)
req :: Stage -> Marker -> (String -> IO ()) -> IO () req :: Stage -> Marker -> (String -> IO ()) -> IO ()
req stage marker a = do 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 maybe noop a =<< getMarked stdin marker