valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor inspection starter

Browse Source
This commit is contained in:
Bo Maryniuk 2016-07-05 10:48:58 +02:00
parent f936dc4892
commit 218e6efc2a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/inspectlib/collector.py
View File

@ -431,6 +431,9 @@ class Inspector(EnvLoader):
if mode not in self.MODE:
raise InspectorSnapshotException("Unknown mode: '{0}'".format(mode))
if is_alive(self.pidfile):
raise CommandExecutionError('Inspection already in progress.')
self._prepare_full_scan(**kwargs)
os.system("nice -{0} python {1} {2} {3} {4} & > /dev/null".format(
@ -468,12 +471,13 @@ def is_alive(pidfile):
'''
Check if PID is still alive.
'''
# Just silencing os.kill exception if no such PID, therefore try/pass.
try:
os.kill(int(open(pidfile).read().strip()), 0)
sys.exit(1)
return True
except Exception as ex:
pass
if os.access(pidfile, os.W_OK) and os.path.isfile(pidfile):
os.unlink(pidfile)
return False
def main(dbfile, pidfile, mode):
@ -489,7 +493,8 @@ if __name__ == '__main__':
sys.exit(1)
pidfile, dbfile, mode = sys.argv[1:]
is_alive(pidfile)
if is_alive(pidfile):
sys.exit(1)
# Double-fork stuff
try: