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

propellor spin

This commit is contained in:
Joey Hess 2014-03-31 18:44:10 -04:00
parent 93d772a60a
commit 45a453a87e
Failed to extract signature
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Propellor/CmdLine.hs
View File

@ -166,9 +166,7 @@ spin host = do
showremote s = putStrLn s showremote s = putStrLn s
senddata toh f marker s = void $ senddata toh f marker s = void $
actionMessage ("Sending " ++ f ++ " (" ++ show (length s) ++ " bytes) to " ++ host) $ do actionMessage ("Sending " ++ f ++ " (" ++ show (length s) ++ " bytes) to " ++ host) $ do
hFlush stdout sendMarked toh marker s
hPutStrLn toh $ toMarked marker s
hFlush toh
return True return True
sendGitClone :: HostName -> String -> IO () sendGitClone :: HostName -> String -> IO ()
@ -206,6 +204,13 @@ privDataMarker = "PRIVDATA "
toMarked :: Marker -> String -> String toMarked :: Marker -> String -> String
toMarked marker = intercalate "\n" . map (marker ++) . lines toMarked marker = intercalate "\n" . map (marker ++) . lines
sendMarked :: Handle -> Marker -> String -> IO ()
sendMarked h marker s = do
-- Prefix string with newline because sometimes a
-- incomplete line is output.
hPutStrLn h ("\n" ++ toMarked marker s)
hFlush h
fromMarked :: Marker -> Marked -> Maybe String fromMarked :: Marker -> Marked -> Maybe String
fromMarked marker s fromMarked marker s
| null matches = Nothing | null matches = Nothing
@ -217,8 +222,7 @@ fromMarked marker s
boot :: [Property] -> IO () boot :: [Property] -> IO ()
boot props = do boot props = do
putStrLn $ toMarked statusMarker $ show Ready sendMarked stdout statusMarker $ show Ready
hFlush stdout
reply <- hGetContentsStrict stdin reply <- hGetContentsStrict stdin
makePrivDataDir makePrivDataDir