Use systemd-notify on systems without python2 systemd bindings

saltstack · Sep 11, 2015 · 134b3a6 · 134b3a6
1 parent b676e32
commit 134b3a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/pkg/salt-master.service b/pkg/salt-master.service
@@ -5,6 +5,7 @@ After=syslog.target network.target
 [Service]
 LimitNOFILE=16384
 Type=notify
+NotifyAccess=all
 ExecStart=/usr/bin/salt-master
 
 [Install]

diff --git a/salt/utils/process.py b/salt/utils/process.py
@@ -35,14 +35,24 @@
     pass
 
 
+def systemd_notify_call(action):
+    process = subprocess.Popen(['systemd-notify', action], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    process.communicate()
+    status = process.poll()
+    return status == 0
+
+
 def notify_systemd():
     '''
     Notify systemd that this process has started
     '''
     try:
         import systemd.daemon
     except ImportError:
+        if salt.utils.which('systemd-notify') and systemd_notify_call('--booted'):
+            return systemd_notify_call('--ready')
         return False
+
     if systemd.daemon.booted():
         try:
             return systemd.daemon.notify('READY=1')