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

Merge pull request #14390 from hvnsweeting/2014.7.state.process

Browse Source 
add user and signal args
This commit is contained in:
Thomas S Hatch 2014-07-23 11:40:19 -06:00
commit fe4b80b3c0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/states/process.py
View File

@ -17,12 +17,18 @@ def __virtual__():
return 'ps.pkill' in __salt__
def absent(name):
def absent(name, user=None, signal=None):
'''
Ensures that the named command is not running.
name
The pattern to match.
user
The user process belongs
signal
Signal to send to the process(es).
'''
ret = {'name': name,
'changes': {},
@ -30,15 +36,20 @@ def absent(name):
'comment': ''}
if __opts__['test']:
running = __salt__['ps.pgrep'](name)
running = __salt__['ps.pgrep'](name, user=user)
ret['result'] = None
if running:
ret['comment'] = '{0} processes will be killed'.format(len(running))
ret['comment'] = ('{0} processes will ',
'be killed').format(len(running))
else:
ret['comment'] = 'No matching processes running'
return ret
status = __salt__['ps.pkill'](name, full=True)
if signal:
status = __salt__['ps.pkill'](name, user=user,
signal=signal, full=True)
else:
status = __salt__['ps.pkill'](name, user=user, full=True)
ret['result'] = True
if status: