openstack/cinder
Code Issues Proposed changes

Move wsgi to oslo_service.wsgi

Browse Source 
This patch replaces wsgi with oslo_service.wsgi in service.py

DocImpact
Implements: blueprint reusing-wsgi-from-oslo.service
Change-Id: Ib4c4bf9d78571d63c667753ea10dfea28ea6b866
This commit is contained in:
Yuriy Nesenenko
2015-12-16 16:22:46 +02:00
parent 1847abf0a5
commit 082235d311
6 changed files with 52 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/service.py
View File

@@ -29,6 +29,7 @@ from oslo_log import log as logging
import oslo_messaging as messaging
from oslo_service import loopingcall
from oslo_service import service
from oslo_service import wsgi
from oslo_utils import importutils
import osprofiler.notifier
from osprofiler import profiler
@@ -41,8 +42,7 @@ from cinder import objects
from cinder.objects import base as objects_base
from cinder import rpc
from cinder import version
from cinder.wsgi import common as wsgi_common
from cinder.wsgi import eventlet_server as wsgi
LOG = logging.getLogger(__name__)
@@ -358,7 +358,7 @@ class WSGIService(service.ServiceBase):
"""
self.name = name
self.manager = self._get_manager()
self.loader = loader or wsgi_common.Loader()
self.loader = loader or wsgi.Loader(CONF)
self.app = self.loader.load_app(name)
self.host = getattr(CONF, '%s_listen' % name, "0.0.0.0")
self.port = getattr(CONF, '%s_listen_port' % name, 0)