diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index 92f07d7e27..349b7388e0 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -135,7 +135,7 @@ connection = sqlite:///trove_test.sqlite # idle connections. This can result in 'MySQL Gone Away' exceptions. If you # notice this, you can lower this value to ensure that SQLAlchemy reconnects # before MySQL can drop the connection. -idle_timeout = 3600 +connection_recycle_time = 3600 [composite:trove] use = call:trove.common.wsgi:versioned_urlmap diff --git a/releasenotes/notes/remove-idle-timeout-e4a5db0d5ee524d7.yaml b/releasenotes/notes/remove-idle-timeout-e4a5db0d5ee524d7.yaml new file mode 100644 index 0000000000..6eecb7d4b5 --- /dev/null +++ b/releasenotes/notes/remove-idle-timeout-e4a5db0d5ee524d7.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Removed the ``[database] idle_timeout`` and ``[DEFAULT] idle_timeout`` options. + These were all legacy aliases for ``[database] connection_recycle_time``. diff --git a/trove/common/cfg.py b/trove/common/cfg.py index a717a71c6b..ead42908f0 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -538,10 +538,8 @@ database_opts = [ secret=True, deprecated_name='sql_connection', deprecated_group='DEFAULT'), - cfg.IntOpt('idle_timeout', - default=3600, - deprecated_name='sql_idle_timeout', - deprecated_group='DEFAULT'), + cfg.IntOpt('connection_recycle_time', + default=3600), cfg.BoolOpt('query_log', default=False, deprecated_name='sql_query_log',