feffe/sau
1
0
Fork 0
Code Issues Pull Requests Projects Releases 20 Wiki Activity

added option to silently restart services

Browse Source
This commit is contained in:
Fredrik Eriksson 2019-04-09 21:53:55 +02:00
parent febd6e2eb7
commit 2818e57023
No known key found for this signature in database
GPG Key ID: 8825C73A0FD1502A
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.cfg
View File

@ -59,6 +59,9 @@ gitlab-workhorse=gitlab
qemu-system-x86_64= qemu-system-x86_64=
# The services section contains restart policy for specific services. # The services section contains restart policy for specific services.
# valid policies are 'ignore', 'warn' and 'restart'. # valid policies are 'ignore', 'warn', 'restart' and 'silent-restart'.
# 'silent-restart' is like 'restart', but will not log a warning when
# the service is restarted.
[services] [services]
libvirtd=ignore libvirtd=ignore
php-fpm=silent-restart

12
sau/services.py
View File

@ -99,8 +99,7 @@ def restart_services():
service_procs.add(parents[-2]) service_procs.add(parents[-2])
retest_procs.add(proc) retest_procs.add(proc)
services = set() processes = {}
processes = set()
services = {} services = {}
for proc in service_procs: for proc in service_procs:
try: try:
@ -111,6 +110,7 @@ def restart_services():
continue continue
if proc_name in services: if proc_name in services:
processes[services[proc_name]].append(proc)
# we have already checked a process with this name # we have already checked a process with this name
continue continue
@ -137,6 +137,7 @@ def restart_services():
continue continue
services[proc_name] = service_name services[proc_name] = service_name
processes[service_name] = [proc]
for service in [x for x in services.values() if x]: for service in [x for x in services.values() if x]:
policy = _get_service_restart_policy(service) policy = _get_service_restart_policy(service)
@ -147,7 +148,8 @@ def restart_services():
log.warning('Service "{}" has open deleted files and should be restarted'.format(service)) log.warning('Service "{}" has open deleted files and should be restarted'.format(service))
continue continue
log.info('Restarting service {}'.format(service)) if not policy.startswith('silent'):
log.warning('Restarting service {}'.format(service))
platform.restart_service(service) platform.restart_service(service)
recommend_restart = False recommend_restart = False
@ -174,13 +176,13 @@ def restart_services():
def _get_service_restart_policy(service): def _get_service_restart_policy(service):
conf = sau.config conf = sau.config
policy = conf.get('services', service, fallback=None) policy = conf.get('services', service, fallback=None)
if policy and policy.lower() in ('restart', 'warn', 'ignore'): if policy and policy.lower() in ('restart', 'warn', 'ignore', 'silent-restart'):
return policy.lower() return policy.lower()
elif policy: elif policy:
log.warning('service policy {} for {} is invalid'.format(policy, service)) log.warning('service policy {} for {} is invalid'.format(policy, service))
default_policy = conf.get('services', 'default_service_policy', fallback='warn') default_policy = conf.get('services', 'default_service_policy', fallback='warn')
if default_policy.lower() in ('restart', 'warn', 'ignore'): if default_policy.lower() in ('restart', 'warn', 'ignore', 'silent-restart'):
return default_policy.lower() return default_policy.lower()
log.warning('default service policy {} is invalid'.format(default_policy)) log.warning('default service policy {} is invalid'.format(default_policy))
return 'warn' return 'warn'