From 4d69d83def502b3a5c75b7145dbdd92ce18f3c6c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Apr 2014 15:07:51 -0400 Subject: propellor spin --- Propellor/Property/Docker.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Propellor') diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index da9ac36d..149df756 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -231,7 +231,7 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci if runningident == Just ident then return NoChange else do - print "container parameters changed" + debug ["container parameters changed"] void $ stopContainer cid oldimage <- fromMaybe image <$> commitContainer cid void $ removeContainer cid @@ -244,11 +244,8 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci ident = ContainerIdent image hn cn runps getrunningident :: IO (Maybe ContainerIdent) - getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \vs -> do - let l = (extractident) vs - print l - print vs - return l + getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ + return . extractident extractident :: [Resp] -> Maybe ContainerIdent extractident = headMaybe . catMaybes . map readish . catMaybes . map getStdout -- cgit v1.2.3