vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2985 from coreos-inc/fix-pooled-args-non-pooled

Browse source 
Remove unsupported DB connection arguments for non-pooled DB handler
This commit is contained in:
josephschorr 2018-01-26 13:37:40 -05:00 committed by GitHub
commit acf41ca1c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/database.py
View file

@ -282,6 +282,8 @@ def _db_from_url(url, db_kwargs, connect_timeout=DEFAULT_DB_CONNECT_TIMEOUT):
parsed_url.drivername, db_kwargs['stale_timeout'], db_kwargs['max_connections']) parsed_url.drivername, db_kwargs['stale_timeout'], db_kwargs['max_connections'])
else: else:
logger.info('Connection pooling disabled for %s', parsed_url.drivername) logger.info('Connection pooling disabled for %s', parsed_url.drivername)
db_kwargs.pop('stale_timeout', None)
db_kwargs.pop('max_connections', None)
wrapped_driver = _wrap_for_retry(driver) wrapped_driver = _wrap_for_retry(driver)
return wrapped_driver(parsed_url.database, **db_kwargs) return wrapped_driver(parsed_url.database, **db_kwargs)