From f31f8e8358397c8fef3a8334c1b8d12810a4743a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Apr 2014 15:49:49 -0400 Subject: propellor spin --- Propellor/Property/Docker.hs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Propellor/Property') diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index e96603f5..2ed35fb4 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -227,11 +227,9 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci -- parameters of the container differ and it must -- be restarted. runningident <- getrunningident - print runningident if runningident == Just ident then return NoChange else do - error "container parameters changed" void $ stopContainer cid restartcontainer else ifM (elem cid <$> listContainers AllContainers) @@ -247,9 +245,8 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci go oldimage getrunningident :: IO (Maybe ContainerIdent) - getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \rs -> do - print (rs, extractident rs) - return $ extractident rs + getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ + return . extractident extractident :: [Resp] -> Maybe ContainerIdent extractident = headMaybe . catMaybes . map (readish :: String -> Maybe ContainerIdent) . catMaybes . map getStdout -- cgit v1.2.3