on master help sign in
changed logs to streaming
commit35118127d29bad7c365eca011db070c2d22cc0cf authoriko <ilyakooo0@gmail.com> dateMon 24 Feb 2020, 21:53 (7 years ago) parentfedb73a
2 files changed+6−2
package.yaml+1 src/Data/Tasks/Build.hs+5−2
package.yaml+1
@@ -53,6 +53,7 @@ library:
5353 - cassava
5454 - http-media
5555 - utf8-string
56+ - conduit-extra
5657
5758executables:
5859 sc-build-exe:
src/Data/Tasks/Build.hs+5−2
@@ -17,6 +17,7 @@ import Control.Task
1717import Data.Aeson hiding (Success)
1818import qualified Data.ByteString.Lazy.Char8 as BS
1919import qualified Data.ByteString.Lazy.UTF8 as BS
20+import qualified Data.Conduit.Binary as Conduit
2021import Data.String
2122import Data.Submission
2223import Data.Submission.Query
@@ -106,7 +107,7 @@ instance Task Build "build-repo" where
106107 buildCode <- ExceptT $ waitDockerForever cid
107108 buildOut <-
108109 ExceptT $
109− D.getContainerLogs
110+ D.getContainerLogsStream
110111 D.LogOpts
111112 { stdout = True,
112113 stderr = False,
@@ -115,9 +116,10 @@ instance Task Build "build-repo" where
115116 tail = D.All
116117 }
117118 cid
119+ Conduit.sinkLbs
118120 buildErr <-
119121 ExceptT $
120− D.getContainerLogs
122+ D.getContainerLogsStream
121123 D.LogOpts
122124 { stdout = True,
123125 stderr = True,
@@ -126,6 +128,7 @@ instance Task Build "build-repo" where
126128 tail = D.All
127129 }
128130 cid
131+ Conduit.sinkLbs
129132 return (buildCode, buildOut, buildErr)
130133 case dockerRes of
131134 (ExitFailure n, _, buildErr) -> do