From 027132e56bc64bd3115fd12cddc29afdee724a40 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Mon, 28 May 2018 16:44:14 +0200 Subject: [PATCH] db: don't propagate ping connection option into engine configuration as it's an internal flag for rhodecode. --- rhodecode/lib/utils2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py index 65d52353..0a92f1af 100644 --- a/rhodecode/lib/utils2.py +++ b/rhodecode/lib/utils2.py @@ -353,6 +353,8 @@ def ping_connection(connection, branch): def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs): """Custom engine_from_config functions.""" log = logging.getLogger('sqlalchemy.engine') + _ping_connection = configuration.pop('sqlalchemy.db1.ping_connection', None) + engine = sqlalchemy.engine_from_config(configuration, prefix, **kwargs) def color_sql(sql): @@ -360,7 +362,6 @@ def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs): normal = '\x1b[0m' return ''.join([color_seq, sql, normal]) - _ping_connection = configuration.get('sqlalchemy.db1.ping_connection') if configuration['debug'] or _ping_connection: sqlalchemy.event.listen(engine, "engine_connect", ping_connection)