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

services[name] -> service

Browse source
This commit is contained in:
Alexandre Aubin 2020-05-06 18:12:55 +02:00
parent 42bc8c354a
commit 199258166e
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/yunohost/service.py
View file

@ -61,13 +61,13 @@ def service_add(name, description=None, log=None, log_type="file", test_status=N
"""
services = _get_services()
services[name] = {}
services[name] = service = {}
if log is not None:
if not isinstance(log, list):
log = [log]
services[name]['log'] = log
service['log'] = log
if not isinstance(log_type, list):
log_type = [log_type]
@ -76,12 +76,12 @@ def service_add(name, description=None, log=None, log_type="file", test_status=N
log_type.extend([log_type[-1]] * (len(log) - len(log_type))) # extend list to have the same size as log
if len(log_type) == len(log):
services[name]['log_type'] = log_type
service['log_type'] = log_type
else:
raise YunohostError('service_add_failed', service=name)
if description:
services[name]['description'] = description
service['description'] = description
else:
# Try to get the description from systemd service
out = subprocess.check_output("systemctl show %s | grep '^Description='" % name, shell=True).strip()
@ -92,23 +92,23 @@ def service_add(name, description=None, log=None, log_type="file", test_status=N
if out == name + ".service":
logger.warning("/!\\ Packager ! You added a custom service without specifying a description. Please add a proper Description in the systemd configuration, or use --description to explain what the service does in a similar fashion to existing services.")
else:
services[name]['description'] = out
service['description'] = out
if need_lock:
services[name]['need_lock'] = True
service['need_lock'] = True
if test_status:
services[name]["test_status"] = test_status
service["test_status"] = test_status
if test_conf:
services[name]["test_conf"] = test_conf
service["test_conf"] = test_conf
if needs_exposed_ports:
services[name]["needs_exposed_ports"] = needs_exposed_ports
service["needs_exposed_ports"] = needs_exposed_ports
try:
_save_services(services)
except:
except Exception:
# we'll get a logger.warning with more details in _save_services
raise YunohostError('service_add_failed', service=name)
@ -288,6 +288,8 @@ def service_status(names=[]):
if check_names and name not in services.keys():
raise YunohostError('service_unknown', service=name)
service = services[name]
# this "service" isn't a service actually so we skip it
#
# the historical reason is because regenconf has been hacked into the
@ -296,10 +298,10 @@ def service_status(names=[]):
# the hack was to add fake services...
# we need to extract regenconf from service at some point, also because
# some app would really like to use it
if services[name].get("status", "") is None:
if service.get("status", "") is None:
continue
systemd_service = services[name].get("actual_systemd_service", name)
systemd_service = service.get("actual_systemd_service", name)
status = _get_service_information_from_systemd(systemd_service)
if status is None:
@ -314,8 +316,8 @@ def service_status(names=[]):
else:
translation_key = "service_description_%s" % name
if "description" in services[name] is not None:
description = services[name].get("description")
if "description" in service is not None:
description = service.get("description")
else:
description = m18n.n(translation_key)
@ -344,8 +346,8 @@ def service_status(names=[]):
result[name]['last_state_change'] = datetime.utcfromtimestamp(status["StateChangeTimestamp"] / 1000000)
# 'test_status' is an optional field to test the status of the service using a custom command
if "test_status" in services[name]:
p = subprocess.Popen(services[name]["test_status"],
if "test_status" in service:
p = subprocess.Popen(service["test_status"],
shell=True,
executable='/bin/bash',
stdout=subprocess.PIPE,
@ -356,8 +358,8 @@ def service_status(names=[]):
result[name]["status"] = "running" if p.returncode == 0 else "failed"
# 'test_status' is an optional field to test the status of the service using a custom command
if "test_conf" in services[name]:
p = subprocess.Popen(services[name]["test_conf"],
if "test_conf" in service:
p = subprocess.Popen(service["test_conf"],
shell=True,
executable='/bin/bash',
stdout=subprocess.PIPE,