Revert "changed logs to streaming"

This reverts commit 35118127d2.
This commit is contained in:
iko 2020-02-24 23:16:42 +03:00
parent 35118127d2
commit c8d7f9abec
2 changed files with 2 additions and 6 deletions

View File

@ -53,7 +53,6 @@ library:
- cassava
- http-media
- utf8-string
- conduit-extra
executables:
sc-build-exe:

View File

@ -17,7 +17,6 @@ import Control.Task
import Data.Aeson hiding (Success)
import qualified Data.ByteString.Lazy.Char8 as BS
import qualified Data.ByteString.Lazy.UTF8 as BS
import qualified Data.Conduit.Binary as Conduit
import Data.String
import Data.Submission
import Data.Submission.Query
@ -107,7 +106,7 @@ instance Task Build "build-repo" where
buildCode <- ExceptT $ waitDockerForever cid
buildOut <-
ExceptT $
D.getContainerLogsStream
D.getContainerLogs
D.LogOpts
{ stdout = True,
stderr = False,
@ -116,10 +115,9 @@ instance Task Build "build-repo" where
tail = D.All
}
cid
Conduit.sinkLbs
buildErr <-
ExceptT $
D.getContainerLogsStream
D.getContainerLogs
D.LogOpts
{ stdout = True,
stderr = True,
@ -128,7 +126,6 @@ instance Task Build "build-repo" where
tail = D.All
}
cid
Conduit.sinkLbs
return (buildCode, buildOut, buildErr)
case dockerRes of
(ExitFailure n, _, buildErr) -> do