summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-10 18:21:03 +0000
committerGerrit Code Review <review@openstack.org>2016-08-10 18:21:03 +0000
commit6f615b4bd5a4de95fa78067bf96176ccc055b458 (patch)
tree3df4fcf107066cc153e462f00f24f3052b74e338
parentf3d123a34d2377a87fa0c36b6edae06fb10d7cc6 (diff)
parent8e2e97cd1ed3fa3117e761b8f7f2b270e3ce891a (diff)
downloadoslo-db-6f615b4bd5a4de95fa78067bf96176ccc055b458.tar.gz
Merge "Add logging_name to enginefacade config"
-rw-r--r--oslo_db/sqlalchemy/enginefacade.py1
-rw-r--r--oslo_db/tests/sqlalchemy/test_sqlalchemy.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/oslo_db/sqlalchemy/enginefacade.py b/oslo_db/sqlalchemy/enginefacade.py
index 9929304..8150875 100644
--- a/oslo_db/sqlalchemy/enginefacade.py
+++ b/oslo_db/sqlalchemy/enginefacade.py
@@ -145,6 +145,7 @@ class _TransactionFactory(object):
'thread_checkin': _Default(True),
'json_serializer': _Default(None),
'json_deserializer': _Default(None),
+ 'logging_name': _Default(None)
}
self._maker_cfg = {
'expire_on_commit': _Default(False),
diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
index 6f327d6..19cfe99 100644
--- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
+++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
@@ -351,6 +351,7 @@ class EngineFacadeTestCase(oslo_test.BaseTestCase):
thread_checkin=mock.ANY,
json_serializer=None,
json_deserializer=None,
+ logging_name=mock.ANY,
)
get_maker.assert_called_once_with(engine=create_engine(),
autocommit=False,