openstack/aodh
Code Issues Proposed changes

Merge "fix session connection"

Browse Source
This commit is contained in:
Jenkins 2013-06-11 18:28:40 +00:00 committed by Gerrit Code Review
commit 74c6b25b72
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/storage/__init__.py
View File

@ -57,7 +57,8 @@ def register_opts(conf):
def get_engine(conf): def get_engine(conf):
"""Load the configured engine and return an instance.""" """Load the configured engine and return an instance."""
if conf.database_connection: if conf.database_connection:
conf.database.connection = conf.database_connection conf.set_override('connection', conf.database_connection,
group='database')
engine_name = urlparse.urlparse(conf.database.connection).scheme engine_name = urlparse.urlparse(conf.database.connection).scheme
LOG.debug('looking for %r driver in %r', LOG.debug('looking for %r driver in %r',
engine_name, STORAGE_ENGINE_NAMESPACE) engine_name, STORAGE_ENGINE_NAMESPACE)

1
ceilometer/storage/impl_mongodb.py
View File

@ -322,7 +322,6 @@ class Connection(base.Connection):
# a new key '_id'). # a new key '_id').
record = copy.copy(data) record = copy.copy(data)
self.db.meter.insert(record) self.db.meter.insert(record)
return
def get_users(self, source=None): def get_users(self, source=None):
"""Return an iterable of user id strings. """Return an iterable of user id strings.

2
ceilometer/storage/impl_sqlalchemy.py
View File

@ -212,8 +212,6 @@ class Connection(base.Connection):
meter.message_id = data['message_id'] meter.message_id = data['message_id']
session.flush() session.flush()
return
def get_users(self, source=None): def get_users(self, source=None):
"""Return an iterable of user id strings. """Return an iterable of user id strings.