on master help sign in
Revert "changed logs to streaming"

This reverts commit 35118127d29bad7c365eca011db070c2d22cc0cf.

commitc8d7f9abec1e8f6bdcf52d2191c0941dd568be55 authoriko <ilyakooo0@gmail.com> dateMon 24 Feb 2020, 23:16 (7 years ago) parent3511812
2 files changed+2−6
package.yaml−1 src/Data/Tasks/Build.hs+2−5
package.yaml−1
@@ -53,7 +53,6 @@ library:
5353 - cassava
5454 - http-media
5555 - utf8-string
56− - conduit-extra
5756
5857executables:
5958 sc-build-exe:
src/Data/Tasks/Build.hs+2−5
@@ -17,7 +17,6 @@ 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
2120import Data.String
2221import Data.Submission
2322import Data.Submission.Query
@@ -107,7 +106,7 @@ instance Task Build "build-repo" where
107106 buildCode <- ExceptT $ waitDockerForever cid
108107 buildOut <-
109108 ExceptT $
110− D.getContainerLogsStream
109+ D.getContainerLogs
111110 D.LogOpts
112111 { stdout = True,
113112 stderr = False,
@@ -116,10 +115,9 @@ instance Task Build "build-repo" where
116115 tail = D.All
117116 }
118117 cid
119− Conduit.sinkLbs
120118 buildErr <-
121119 ExceptT $
122− D.getContainerLogsStream
120+ D.getContainerLogs
123121 D.LogOpts
124122 { stdout = True,
125123 stderr = True,
@@ -128,7 +126,6 @@ instance Task Build "build-repo" where
128126 tail = D.All
129127 }
130128 cid
131− Conduit.sinkLbs
132129 return (buildCode, buildOut, buildErr)
133130 case dockerRes of
134131 (ExitFailure n, _, buildErr) -> do