3511812 · sc-build · git.iko.soy

git.iko.soy/sc-build

on master help sign in

changed logs to streaming

3511812iko7 years ago

package.yaml+1

compare with master

unifiedsplit

@@ -53,6 +53,7 @@ library:

53 - cassava

54 - http-media

55 - utf8-string

56+ - conduit-extra

57executables:

58executables:

58 sc-build-exe:

59 sc-build-exe:

src/Data/Tasks/Build.hs+5−2

@@ -17,6 +17,7 @@ import Control.Task

17import Data.Aeson hiding (Success)

18import qualified Data.ByteString.Lazy.Char8 as BS

19import qualified Data.ByteString.Lazy.UTF8 as BS

20+import qualified Data.Conduit.Binary as Conduit

20import Data.String

21import Data.String

21import Data.Submission

22import Data.Submission

22import Data.Submission.Query

23import Data.Submission.Query

@@ -106,7 +107,7 @@ instance Task Build "build-repo" where

106 buildCode <- ExceptT $ waitDockerForever cid

107 buildCode <- ExceptT $ waitDockerForever cid

107 buildOut <-

108 buildOut <-

108 ExceptT $

109 ExceptT $

109− D.getContainerLogs

110+ D.getContainerLogsStream

110 D.LogOpts

111 D.LogOpts

111 { stdout = True,

112 { stdout = True,

112 stderr = False,

113 stderr = False,

@@ -115,9 +116,10 @@ instance Task Build "build-repo" where

115 tail = D.All

116 tail = D.All

116 }

117 }

117 cid

118 cid

119+ Conduit.sinkLbs

118 buildErr <-

120 buildErr <-

119 ExceptT $

121 ExceptT $

120− D.getContainerLogs

122+ D.getContainerLogsStream

121 D.LogOpts

123 D.LogOpts

122 { stdout = True,

124 { stdout = True,

123 stderr = True,

125 stderr = True,

@@ -126,6 +128,7 @@ instance Task Build "build-repo" where

126 tail = D.All

128 tail = D.All

127 }

129 }

128 cid

130 cid

131+ Conduit.sinkLbs

129 return (buildCode, buildOut, buildErr)

132 return (buildCode, buildOut, buildErr)

130 case dockerRes of

133 case dockerRes of

131 (ExitFailure n, _, buildErr) -> do

134 (ExitFailure n, _, buildErr) -> do