summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-12-08 01:22:29 -0400
committerJoey Hess2014-12-08 01:22:29 -0400
commit834a05e25a5844ff3aec4e4acecf00cc762d6545 (patch)
tree49feff7704a7a1dc00d29a466a6152809f1a41e9 /src/Propellor/Property
parent06975ec5e1b9e7d6018074aad55aa8b56cd64aba (diff)
refactor
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Service.hs17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/Propellor/Property/Service.hs b/src/Propellor/Property/Service.hs
index 14e769d0..93e959c6 100644
--- a/src/Propellor/Property/Service.hs
+++ b/src/Propellor/Property/Service.hs
@@ -13,19 +13,16 @@ type ServiceName = String
-- we can do is try to start the service, and if it fails, assume
-- this means it's already running.
running :: ServiceName -> Property
-running svc = property ("running " ++ svc) $ do
- void $ ensureProperty $
- scriptProperty ["service " ++ shellEscape svc ++ " start >/dev/null 2>&1 || true"]
- return NoChange
+running = signaled "start" "running"
restarted :: ServiceName -> Property
-restarted svc = property ("restarted " ++ svc) $ do
- void $ ensureProperty $
- scriptProperty ["service " ++ shellEscape svc ++ " restart >/dev/null 2>&1 || true"]
- return NoChange
+restarted = signaled "restart" "restarted"
reloaded :: ServiceName -> Property
-reloaded svc = property ("reloaded " ++ svc) $ do
+reloaded = signaled "reload" "reloaded"
+
+signaled :: String -> Desc -> ServiceName -> Property
+signaled cmd desc svc = property (desc ++ " " ++ svc) $ do
void $ ensureProperty $
- scriptProperty ["service " ++ shellEscape svc ++ " reload >/dev/null 2>&1 || true"]
+ scriptProperty ["service " ++ shellEscape svc ++ " " ++ cmd ++ " >/dev/null 2>&1 || true"]
return NoChange