# HG changeset patch # User Marcin Kuzminski # Date 2018-05-28 14:44:14 # Node ID 937fae28f87c4d369363b8e55285046b8998d93b # Parent 3c4a3ff6bffcba5a7c5b820722c1d5dfa2910091 db: don't propagate ping connection option into engine configuration as it's an internal flag for rhodecode. diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py --- 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, pr 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)