YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jérôme Lebleu 2014-07-01 14:59:28 +02:00
parent ba61264331
commit 4f48d1fc10
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
service.py
View file

@ -200,14 +200,14 @@ def service_status(names=[]):
# Retrieve service status
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:
if 'usage:' not in e.output.lower():
result[name]['status'] = 'inactive'
else:
# TODO: Log output?
if 'usage:' in e.output.lower():
msignals.display(m18n.n('service_status_failed', name),
'warning')
else:
result[name]['status'] = 'inactive'
else:
result[name]['status'] = 'running'