From d59973295d0349abcdfcedfcd81531dcaddb1b85 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@threatgrid.com>
Date: Mon, 10 Mar 2014 00:09:08 -0500
Subject: [PATCH 1/2] #6341: check systemd service status with show subcommand

---
 library/system/service | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/library/system/service b/library/system/service
index 2e26a47b636..49708ce28e6 100644
--- a/library/system/service
+++ b/library/system/service
@@ -473,7 +473,27 @@ class LinuxService(Service):
         if location.get('initctl', None):
             self.svc_initctl = location['initctl']
 
+    def get_systemd_service_status(self):
+        (rc, out, err) = self.execute_command("%s show %s" % (self.enable_cmd, self.__systemd_unit))
+        d = dict(line.split('=', 1) for line in out.splitlines())
+        if d['ActiveState'] == 'active':
+            # run-once services (for which a single successful exit indicates
+            # that they are running as designed) should not be restarted here.
+            # Thus, we are not checking d['SubState'].
+            self.running = True
+            self.crashed = False
+        elif d['ActiveState'] == 'failed':
+            self.running = False
+            self.crashed = True
+        else:
+            self.running = False
+            self.crashed = False
+        return self.running
+
     def get_service_status(self):
+        if self.svc_cmd and self.svc_cmd.endswith('systemctl'):
+            return self.get_systemd_service_status()
+
         self.action = "status"
         rc, status_stdout, status_stderr = self.service_control()
 

From 18f53d92195a6707afd2f8cbcea7362dd261594e Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@threatgrid.com>
Date: Mon, 10 Mar 2014 01:05:48 -0500
Subject: [PATCH 2/2] #6341: use shared function for parsing systemd status;
 check rc code

---
 library/system/service | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/library/system/service b/library/system/service
index 49708ce28e6..a25cf208ed9 100644
--- a/library/system/service
+++ b/library/system/service
@@ -473,18 +473,25 @@ class LinuxService(Service):
         if location.get('initctl', None):
             self.svc_initctl = location['initctl']
 
+    def get_systemd_status_dict(self):
+        (rc, out, err) = self.execute_command("%s show %s" % (self.enable_cmd, self.__systemd_unit,))
+        if rc != 0:
+            self.module.fail_json('failure %d running systemctl show for %r: %s' % (self.__systemd_unit, rc, err))
+        return dict(line.split('=', 1) for line in out.splitlines())
+
     def get_systemd_service_status(self):
-        (rc, out, err) = self.execute_command("%s show %s" % (self.enable_cmd, self.__systemd_unit))
-        d = dict(line.split('=', 1) for line in out.splitlines())
-        if d['ActiveState'] == 'active':
+        d = self.get_systemd_status_dict()
+        if d.get('ActiveState') == 'active':
             # run-once services (for which a single successful exit indicates
             # that they are running as designed) should not be restarted here.
             # Thus, we are not checking d['SubState'].
             self.running = True
             self.crashed = False
-        elif d['ActiveState'] == 'failed':
+        elif d.get('ActiveState') == 'failed':
             self.running = False
             self.crashed = True
+        elif d.get('ActiveState') is None:
+            self.module.fail_json(msg='No ActiveState value in systemctl show output for %r' % (self.__systemd_unit,))
         else:
             self.running = False
             self.crashed = False
@@ -605,9 +612,7 @@ class LinuxService(Service):
                 return
 
         if self.enable_cmd.endswith("systemctl"):
-            (rc, out, err) = self.execute_command("%s show %s" % (self.enable_cmd, self.__systemd_unit))
-
-            d = dict(line.split('=', 1) for line in out.splitlines())
+            d = self.get_systemd_status_dict()
             if "UnitFileState" in d:
                 if self.enable and d["UnitFileState"] == "enabled":
                     return