openstack/zaqar
Code Issues Proposed changes

Merge "Use stevedore instead of importutils"

Browse Source
This commit is contained in:
Jenkins 2013-10-17 13:51:52 +00:00 committed by Gerrit Code Review
commit 1733a05d8e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
marconi/queues/storage/pipeline.py
View File

@ -15,10 +15,10 @@
# limitations under the License.
from oslo.config import cfg
from stevedore import driver
from marconi import common
from marconi.common import decorators
from marconi.openstack.common import importutils
from marconi.openstack.common import log as logging
from marconi.queues.storage import base
@ -67,15 +67,15 @@ def _get_storage_pipeline(resource_name, conf):
pipeline = []
for ns in storage_conf[resource_name + '_pipeline']:
cls = importutils.try_import(ns)
if not cls:
msg = _('Pipe {0} could not be imported').format(ns)
try:
mgr = driver.DriverManager('marconi.queues.storage.pipes',
ns, invoke_on_load=True)
pipeline.append(mgr.driver)
except RuntimeError as exc:
msg = _('Pipe {0} could not be imported: {1}').format(ns, str(exc))
LOG.warning(msg)
continue
pipeline.append(cls())
return common.Pipeline(pipeline)