Fix cinder oslo_log updating from community
Fix cinder oslo_log updating from community Change-Id: I0ee3851eb3e0820b94a9e95a2229f65bc2adcf72 Closes-Bug: #1439533
This commit is contained in:
parent
c0df42479f
commit
9bb53746ce
@ -29,7 +29,7 @@ i18n.install('cinder')
|
||||
from powervc.common import config
|
||||
|
||||
from cinder import utils
|
||||
from cinder.openstack.common import log as logging
|
||||
from oslo_log import log as logging
|
||||
# Currently cinder service uses threading instead of eventlet's event,
|
||||
# This causes if you don't monkey patch threading, it will hang there
|
||||
# all the time. For detail, check this fix in incubator project:
|
||||
@ -51,14 +51,12 @@ from powervc.volume.manager import manager
|
||||
|
||||
eventlet.patcher.monkey_patch(os=False, socket=True, time=True)
|
||||
|
||||
logging.setup('powervc')
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
if __name__ == '__main__':
|
||||
try:
|
||||
logging.setup('powervc')
|
||||
logging.setup(config.CONF, 'powervc')
|
||||
utils.monkey_patch()
|
||||
LOG.info(_('Launching PowerVC Driver StorageManager service...'))
|
||||
launcher = service.ServiceLauncher()
|
||||
|
@ -4,7 +4,7 @@ import logging
|
||||
import sys
|
||||
|
||||
from cinder import exception
|
||||
from cinder.openstack.common import log as cinderLogging
|
||||
from oslo_log import log as cinderLogging
|
||||
from cinder.volume.driver import VolumeDriver
|
||||
from cinderclient.exceptions import NotFound
|
||||
from oslo.config import cfg
|
||||
|
@ -4,7 +4,7 @@ from __future__ import absolute_import
|
||||
import httplib
|
||||
|
||||
from cinderclient import exceptions
|
||||
from cinder.openstack.common import log as logging
|
||||
from oslo_log import log as logging
|
||||
from powervc.common import constants as common_constants
|
||||
from powervc.common.gettextutils import _
|
||||
from powervc.volume.manager import constants
|
||||
|
@ -10,7 +10,7 @@ from cinder import db
|
||||
from cinder import context
|
||||
from cinder import service as taskservice
|
||||
from cinder.openstack.common import service
|
||||
from cinder.openstack.common import log
|
||||
from oslo_log import log
|
||||
from powervc.common import config
|
||||
from powervc.common.gettextutils import _
|
||||
from powervc.volume.manager import constants
|
||||
|
Loading…
x
Reference in New Issue
Block a user