openstack
/
neutron
Code Issues Proposed changes

Merge "neutron-server api worker process should be named to their role"

This commit is contained in:
Zuul 2021-01-11 17:36:06 +00:00 committed by Gerrit Code Review
parent a2a29e2d62 75e030dfbd
commit dfd1483814
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/wsgi.py
View File

@ -60,7 +60,7 @@ def encode_body(body):
class WorkerService(neutron_worker.NeutronBaseWorker):
"""Wraps a worker to be handled by ProcessLauncher"""
def __init__(self, service, application, set_proctitle, disable_ssl=False,
worker_process_count=0):
worker_process_count=0, desc=None):
super(WorkerService, self).__init__(worker_process_count,
set_proctitle)
@ -68,8 +68,10 @@ class WorkerService(neutron_worker.NeutronBaseWorker):
self._application = application
self._disable_ssl = disable_ssl
self._server = None
self.desc = desc
def start(self, desc=None):
desc = desc or self.desc
super(WorkerService, self).start(desc=desc)
# When api worker is stopped it kills the eventlet wsgi server which
# internally closes the wsgi server socket object. This server socket
@ -172,12 +174,12 @@ class Server(object):
self._port,
backlog=backlog)
self._launch(application, workers)
self._launch(application, workers, desc)
def _launch(self, application, workers=0, desc=None):
set_proctitle = "off" if desc is None else CONF.setproctitle
service = WorkerService(self, application, set_proctitle,
self.disable_ssl, workers)
self.disable_ssl, workers, desc)
if workers < 1:
# The API service should run in the current process.
self._server = service