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

Merge pull request #1295 from sharpone74/develop

Browse Source 
Small change in upstart.py service module to correctly report a target service start/stop status.
This commit is contained in:
Thomas S Hatch 2012-05-16 22:52:42 -07:00
commit c2c3ef0712
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/upstart.py
View File

@ -221,9 +221,9 @@ def status(name, sig=None):
salt '*' service.status <service name>
'''
cmd = 'service {0} status'.format(name)
if _service_is_sysv(name):
return not bool(__salt__['cmd.retcode'](cmd))
return 'start/running' in __salt__['cmd.run'](cmd)
if _service_is_upstart(name):
return 'start/running' in __salt__['cmd.run'](cmd)
return not bool(__salt__['cmd.retcode'](cmd))
def _get_service_exec():