openstack
/
neutron
Code Issues Proposed changes

Merge "use callback payloads for _SPAWN events"

This commit is contained in:
Zuul 2017-12-23 16:23:26 +00:00 committed by Gerrit Code Review
parent 65bde9f769 10644ad65b
commit 2bfc219e88
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/service.py
View File

@ -89,7 +89,7 @@ def serve_wsgi(cls):
LOG.exception('Unrecoverable error: please check log '
'for details.')
registry.notify(resources.PROCESS, events.BEFORE_SPAWN, service)
registry.publish(resources.PROCESS, events.BEFORE_SPAWN, service)
return service
@ -262,7 +262,7 @@ def _start_workers(workers):
def start_all_workers():
workers = _get_rpc_workers() + _get_plugins_workers()
launcher = _start_workers(workers)
registry.notify(resources.PROCESS, events.AFTER_SPAWN, None)
registry.publish(resources.PROCESS, events.AFTER_SPAWN, None)
return launcher

2
neutron/tests/unit/test_service.py
View File

@ -69,4 +69,4 @@ class TestRunWsgiApp(base.BaseTestCase):
registry.subscribe(callback, resources.PROCESS, events.AFTER_SPAWN)
service.start_all_workers()
callback.assert_called_once_with(
resources.PROCESS, events.AFTER_SPAWN, mock.ANY)
resources.PROCESS, events.AFTER_SPAWN, mock.ANY, payload=None)