From: Elena Ezhova Date: Tue, 7 Apr 2015 11:55:50 +0000 (+0300) Subject: Handle SIGHUP in dhcp and l3 agents X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d9251d6e35ac87b755b63aa58bb32da20496dfba;p=openstack-build%2Fneutron-build.git Handle SIGHUP in dhcp and l3 agents All launchers implemented in common.service require each service to implement reset method because it is called in case a process receives a SIGHUP. This change adds the reset method to neutron.service.Service class which is used to start dhcp and l3 agents. Now dhcp and l3 agents don't die on receiving SIGHUP and support reloading policy_path and logging options in config. Partial-Bug: #1276694 Change-Id: I96010e44928a665bea546865b2c81bde4ed0adf2 --- diff --git a/neutron/service.py b/neutron/service.py index 448251c38..cc76c0ba9 100644 --- a/neutron/service.py +++ b/neutron/service.py @@ -32,6 +32,7 @@ from neutron.i18n import _LE, _LI from neutron import manager from neutron.openstack.common import loopingcall from neutron.openstack.common import service as common_service +from neutron import policy from neutron import wsgi @@ -286,6 +287,10 @@ class Service(n_rpc.Service): except Exception: LOG.exception(_LE("Exception occurs when waiting for timer")) + def reset(self): + config.setup_logging() + policy.refresh() + def periodic_tasks(self, raise_on_error=False): """Tasks to be run at a periodic interval.""" ctxt = context.get_admin_context()