@@ -12,7 +12,7 @@ import Control.Monad.IO.Class
12import Data.Bits
12import Data.Bits
13import qualified Data.ByteString.Lazy as BS
13import qualified Data.ByteString.Lazy as BS
14import qualified Data.ByteString as BSS
14import qualified Data.ByteString as BSS
15−import Data.Conduit (ConduitT, yield)
15+import Data.Conduit (ConduitM, yield)
16import qualified Data.Conduit.Binary as CB
16import qualified Data.Conduit.Binary as CB
17import Data.Monoid ((<>))
17import Data.Monoid ((<>))
18import qualified Data.Text as T
18import qualified Data.Text as T
@@ -134,7 +134,7 @@ inclusionCheck :: FilePath -> [InclusionPattern] -> Bool
134inclusionCheck f ps = any id (map (\(InclusionPattern p) -> f ~~ T.unpack p) ps)
134inclusionCheck f ps = any id (map (\(InclusionPattern p) -> f ~~ T.unpack p) ps)
137−processLog :: Monad m => ConduitT BSS.ByteString BSS.ByteString m ()
137+processLog :: Monad m => ConduitM BSS.ByteString BSS.ByteString m ()
138processLog = do
138processLog = do
139 -- metadata (is the next string stdout or stderr)
139 -- metadata (is the next string stdout or stderr)
140 _ <- CB.take 4
140 _ <- CB.take 4