Merge "Reload logging options when receiving SIGHUP"
This commit is contained in:
commit
a54c655141
|
@ -397,6 +397,10 @@ class EngineService(service.Service):
|
||||||
LOG.info(_LI("All threads were gone, terminating engine"))
|
LOG.info(_LI("All threads were gone, terminating engine"))
|
||||||
super(EngineService, self).stop()
|
super(EngineService, self).stop()
|
||||||
|
|
||||||
|
def reset(self):
|
||||||
|
super(EngineService, self).reset()
|
||||||
|
logging.setup(cfg.CONF, 'heat')
|
||||||
|
|
||||||
@context.request_context
|
@context.request_context
|
||||||
def identify_stack(self, cnxt, stack_name):
|
def identify_stack(self, cnxt, stack_name):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -3566,6 +3566,11 @@ class StackServiceTest(common.HeatTestCase):
|
||||||
admin_context_method
|
admin_context_method
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@mock.patch('oslo_log.log.setup')
|
||||||
|
def test_engine_service_reset(self, setup_logging_mock):
|
||||||
|
self.eng.reset()
|
||||||
|
setup_logging_mock.assertCalledOnceWith(cfg.CONF, 'heat')
|
||||||
|
|
||||||
|
|
||||||
class ThreadGroupManagerTest(common.HeatTestCase):
|
class ThreadGroupManagerTest(common.HeatTestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
|
Loading…
Reference in New Issue