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

better IO loop, with debugging

This commit is contained in:
Joey Hess 2014-11-18 16:10:13 -04:00
parent 47a7d58336
commit c1a6f81c7e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Propellor/CmdLine.hs
View File

@ -12,7 +12,7 @@ import Control.Exception (bracket)
import System.Posix.IO import System.Posix.IO
import Data.Time.Clock.POSIX import Data.Time.Clock.POSIX
import Control.Concurrent.Async import Control.Concurrent.Async
import qualified Data.ByteString.Lazy as B import qualified Data.ByteString as B
import System.Process (std_in, std_out) import System.Process (std_in, std_out)
import Propellor import Propellor
@ -317,10 +317,17 @@ gitPush hin hout = void $ fromstdin `concurrently` tostdout
where where
fromstdin = do fromstdin = do
h <- fdToHandle hout h <- fdToHandle hout
B.getContents >>= B.hPut h connect stdin h
tostdout = do tostdout = do
h <- fdToHandle hin h <- fdToHandle hin
B.hGetContents h >>= B.putStr connect h stdout
connect fromh toh = do
b <- B.hGetSome fromh 40960
unless (B.null b) $ do
hPutStrLn stderr $ show ("got", fromh, b)
B.hPut toh b
hFlush toh
connect fromh toh
hasOrigin :: IO Bool hasOrigin :: IO Bool
hasOrigin = do hasOrigin = do