[fix] Fix service status checking with custom command (#12)

This commit is contained in:
Jérôme Lebleu 2014-07-01 14:59:28 +02:00
parent ba61264331
commit 4f48d1fc10

View file

@ -200,14 +200,14 @@ def service_status(names=[]):
# Retrieve service status # Retrieve service status
try: try:
ret = subprocess.check_output(status.split(), stderr=subprocess.STDOUT) ret = subprocess.check_output(status, stderr=subprocess.STDOUT,
shell=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if 'usage:' not in e.output.lower(): if 'usage:' in e.output.lower():
result[name]['status'] = 'inactive'
else:
# TODO: Log output?
msignals.display(m18n.n('service_status_failed', name), msignals.display(m18n.n('service_status_failed', name),
'warning') 'warning')
else:
result[name]['status'] = 'inactive'
else: else:
result[name]['status'] = 'running' result[name]['status'] = 'running'