Merge pull request #8 from pruiz/pruiz/fix-master-detection-with-setproctitle

Fix detection of running salt-master, when setproctitle extension has been installed

Author: davromaniak

pepperboard/core/__init__.py

@@ -29,6 +29,8 @@ def getmasterstatus():
     for proc in psutil.process_iter():
         if proc.name() == 'salt-master':
             return 0
+        if len(proc.cmdline()) > 0 and 'salt-master' in proc.cmdline()[0]:
+            return 0
     return 1