Merge pull request #2975 from coreos-inc/db-logging

Extend our logs about whether we are using connection pooling for a DB
This commit is contained in:
josephschorr 2018-01-11 17:31:40 -05:00 committed by GitHub
commit bff96d31db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -275,10 +275,13 @@ def _db_from_url(url, db_kwargs, connect_timeout=DEFAULT_DB_CONNECT_TIMEOUT):
drivers = _SCHEME_DRIVERS[parsed_url.drivername]
driver = drivers.driver
if os.getenv('DB_CONNECTION_POOLING', 'false').lower() == 'true':
logger.info('Connection pooling enabled')
driver = drivers.pooled_driver
db_kwargs['stale_timeout'] = db_kwargs.get('stale_timeout', None)
db_kwargs['max_connections'] = db_kwargs.get('max_connections', None)
logger.info('Connection pooling enabled for %s; stale timeout: %s; max connection count: %s',
parsed_url.drivername, db_kwargs['stale_timeout'], db_kwargs['max_connections'])
else:
logger.info('Connection pooling disabled for %s', parsed_url.drivername)
wrapped_driver = _wrap_for_retry(driver)
return wrapped_driver(parsed_url.database, **db_kwargs)