Fix supervisorctl module after merge issue

reviewable/pr18780/r1
Matt Wright 12 years ago
parent 2c2113430f
commit 6a67572e83

@ -19,10 +19,20 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# #
def _find_supervisorctl():
paths = ['/usr/local/bin', '/usr/bin']
for p in paths:
e = p + '/supervisorctl'
if os.path.exists(e):
return e
def _is_present(name): def _is_present(name):
rc, out, err = _run('%s status' % _find_supervisorctl()) rc, out, err = _run('%s status' % _find_supervisorctl())
return name in out return name in out
def _is_running(name, supervisorctl): def _is_running(name, supervisorctl):
rc, out, err = _run('%s status %s' % (supervisorctl, name)) rc, out, err = _run('%s status %s' % (supervisorctl, name))
return 'RUNNING' in out return 'RUNNING' in out

Loading…
Cancel
Save