saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

if status of service is stop, there is not an error with it

Browse source 
e.g when using service.dead, we will not want an error log for that
This commit is contained in:
Viet Hung Nguyen 2015-04-24 15:04:21 +07:00
parent 2e09789156
commit 92ea163513
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/upstart.py
View file

@ -406,8 +406,15 @@ def status(name, sig=None):
return bool(__salt__['status.pid'](sig))
cmd = ['service', name, 'status']
if _service_is_upstart(name):
return 'start/running' in __salt__['cmd.run'](cmd, python_shell=False)
return not bool(__salt__['cmd.retcode'](cmd, python_shell=False))
# decide result base on cmd output, thus ignore retcode,
# which makes cmd output not at error lvl even when cmd fail.
return 'start/running' in __salt__['cmd.run'](cmd, python_shell=False,
ignore_retcode=True)
# decide result base on retcode, thus ignore output (set quite)
# because there is no way to avoid logging at error lvl when
# service is not running - retcode != 0 (which is totally relevant).
return not bool(__salt__['cmd.retcode'](cmd, python_shell=False,
quite=True))
def _get_service_exec():