diff options
Diffstat (limited to 'src/Control/Funflow/External/Executor.hs')
| -rw-r--r-- | src/Control/Funflow/External/Executor.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Control/Funflow/External/Executor.hs b/src/Control/Funflow/External/Executor.hs index c7c9a5c..92c2c07 100644 --- a/src/Control/Funflow/External/Executor.hs +++ b/src/Control/Funflow/External/Executor.hs @@ -19,6 +19,7 @@ import Control.Exception.Safe import qualified Control.Funflow.ContentStore as CS import Control.Funflow.External import Control.Funflow.External.Coordinator +import qualified Control.Funflow.RemoteCache as Remote import Control.Lens import Control.Monad (forever, mzero, unless) import Control.Monad.Trans (lift) @@ -29,6 +30,7 @@ import Data.Foldable (for_) import Data.Maybe (isJust, isNothing) import Data.Monoid ((<>)) import qualified Data.Text as T +import GHC.IO.Handle (hClose) import Katip as K import Network.HostName import Path @@ -40,7 +42,6 @@ import System.IO (Handle, IOMode (..), import System.Posix.Env (getEnv) import System.Posix.User import System.Process -import GHC.IO.Handle (hClose) data ExecutionResult = -- | The result already exists in the store and there is no need @@ -63,7 +64,8 @@ data ExecutionResult = -- | Execute an individual task. execute :: CS.ContentStore -> TaskDescription -> KatipContextT IO ExecutionResult execute store td = logError $ do - status <- CS.withConstructIfMissing store (td ^. tdOutput) $ \fp -> do + -- We should pass a Remote cacher down to it: + status <- CS.withConstructIfMissing store Remote.NoCache (td ^. tdOutput) $ \fp -> do (fpOut, hOut) <- lift $ CS.createMetadataFile store (td ^. tdOutput) [relfile|stdout|] (fpErr, hErr) <- lift $ @@ -162,7 +164,7 @@ executeLoop :: forall c. Coordinator c -> IO () executeLoop coord cfg store = executeLoopWithScribe coord cfg store =<< - mkHandleScribe ColorIfTerminal stdout InfoS V2 + mkHandleScribe ColorIfTerminal stdout (permitItem InfoS) V2 -- | Same as 'executeLoop', but allows specifying a custom 'Scribe' for logging executeLoopWithScribe :: forall c. Coordinator c |