cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #995 from mattupstate/devel

Browse source 
Use `get_bin_path` properly for supervisorctl module
This commit is contained in:
Michael DeHaan 2012-09-04 16:44:22 -07:00
commit c69c3d6e18
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/supervisorctl
View file

@ -19,10 +19,11 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# #
def _is_present(name): def _is_present(name, supervisorctl):
rc, out, err = _run('%s status' % _find_supervisorctl()) rc, out, err = _run('%s status' % 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
@ -49,10 +50,7 @@ def main():
SUPERVISORCTL = module.get_bin_path('supervisorctl', True) SUPERVISORCTL = module.get_bin_path('supervisorctl', True)
if SUPERVISORCTL is None: present = _is_present(name, SUPERVISORCTL)
module.fail_json(msg='supervisorctl is not installed')
present = _is_present(name)
if state == 'present': if state == 'present':
if not present: if not present: