Skip to content

Commit

Permalink
[AIRFLOW-6948] Remove ASCII Airflow from version command (#7572)
Browse files Browse the repository at this point in the history
cherry-picked from 3709ba9
  • Loading branch information
turbaszek authored and kaxil committed Mar 19, 2020
1 parent e80ad22 commit e82b873
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion airflow/bin/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ def checkdb(args): # noqa

def version(args): # noqa
py2_deprecation_waring()
print(settings.HEADER + " v" + airflow.__version__)
print(airflow.__version__)


alternative_conn_specs = ['conn_type', 'conn_host',
Expand Down
4 changes: 2 additions & 2 deletions airflow/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ def configure_orm(disable_connection_pool=False):
# https://docs.sqlalchemy.org/en/13/core/pooling.html#disconnect-handling-pessimistic
pool_pre_ping = conf.getboolean('core', 'SQL_ALCHEMY_POOL_PRE_PING', fallback=True)

log.info("settings.configure_orm(): Using pool settings. pool_size={}, max_overflow={}, "
"pool_recycle={}, pid={}".format(pool_size, max_overflow, pool_recycle, os.getpid()))
log.debug("settings.configure_orm(): Using pool settings. pool_size=%d, max_overflow=%d, "
"pool_recycle=%d, pid=%d", pool_size, max_overflow, pool_recycle, os.getpid())
engine_args['pool_size'] = pool_size
engine_args['pool_recycle'] = pool_recycle
engine_args['pool_pre_ping'] = pool_pre_ping
Expand Down

0 comments on commit e82b873

Please sign in to comment.