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

improve protocol debugging

This commit is contained in:
Joey Hess 2015-01-05 19:40:27 -04:00
parent de5fad970e
commit 6250b05767
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Propellor/Protocol.hs
View File

@ -41,7 +41,7 @@ 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 req", marker] debug ["sent marked", marker]
-- 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.
@ -57,7 +57,9 @@ 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