Merge pull request #16163 from gtmanfred/2014.7

move systemd notify to process

salt/master.py

@@ -53,12 +53,6 @@ try:
 except ImportError:
     HAS_HALITE = False
 
-try:
-    import systemd.daemon
-    HAS_PYTHON_SYSTEMD = True
-except ImportError:
-    HAS_PYTHON_SYSTEMD = False
-
 
 log = logging.getLogger(__name__)
 
@@ -490,13 +484,6 @@ class ReqServer(object):
 
         self.workers.bind(self.w_uri)
 
-        try:
-            if HAS_PYTHON_SYSTEMD and systemd.daemon.booted():
-                systemd.daemon.notify('READY=1')
-        except SystemError:
-            # Daemon wasn't started by systemd
-            pass
-
         while True:
             try:
                 zmq.device(zmq.QUEUE, self.clients, self.workers)

salt/utils/process.py

@@ -20,6 +20,12 @@ try:
 except ImportError:
     pass
 
+try:
+    import systemd.daemon
+    HAS_PYTHON_SYSTEMD = True
+except ImportError:
+    HAS_PYTHON_SYSTEMD = False
+
 
 def set_pidfile(pidfile, user):
     '''
@@ -178,6 +184,13 @@ class ProcessManager(object):
         # make sure to kill the subprocesses if the parent is killed
         signal.signal(signal.SIGTERM, self.kill_children)
 
+        try:
+            if HAS_PYTHON_SYSTEMD and systemd.daemon.booted():
+                systemd.daemon.notify('READY=1')
+        except SystemError:
+            # Daemon wasn't started by systemd
+            pass
+
         while True:
             try:
                 pid, exit_status = os.wait()