Permalink
Browse files

Merge pull request #1161 from rentalita/develop

Restore default status check for Upstart jobs.
  • Loading branch information...
thatch45 committed May 1, 2012
2 parents f181a83 + 24a590f commit 886252797450ce0435012c50700914954b0900ae
Showing with 3 additions and 1 deletion.
  1. +3 −1 salt/modules/upstart.py
View
@@ -221,7 +221,9 @@ def status(name, sig=None):
salt '*' service.status <service name>
'''
cmd = 'service {0} status'.format(name)
- return not bool(__salt__['cmd.retcode'](cmd))
+ if _service_is_sysv(name):
+ return not bool(__salt__['cmd.retcode'](cmd))
+ return 'start/running' in __salt__['cmd.run'](cmd)
def _get_service_exec():

0 comments on commit 8862527

Please sign in to comment.