Repository: incubator-airflow Updated Branches: refs/heads/master c450b6087 -> e870a8e2c
[AIRFLOW-1337] Make log_format key names lowercase Closes #2395 from ronfung/master Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/e870a8e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/e870a8e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/e870a8e2 Branch: refs/heads/master Commit: e870a8e2c8db23878ce1822cb2a78ee01c114539 Parents: c450b60 Author: Ron Fung <[email protected]> Authored: Fri Jun 23 15:53:15 2017 -0700 Committer: Chris Riccomini <[email protected]> Committed: Fri Jun 23 15:53:21 2017 -0700 ---------------------------------------------------------------------- airflow/config_templates/default_airflow.cfg | 8 ++++---- airflow/settings.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/e870a8e2/airflow/config_templates/default_airflow.cfg ---------------------------------------------------------------------- diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg index fd89e32..dc13a1e 100644 --- a/airflow/config_templates/default_airflow.cfg +++ b/airflow/config_templates/default_airflow.cfg @@ -50,10 +50,10 @@ s3_log_folder = logging_level = INFO # Log format -LOG_FORMAT = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s -LOG_FORMAT_WITH_PID = [%%(asctime)s] [%%(process)d] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s -LOG_FORMAT_WITH_THREAD_NAME = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(threadName)s %%(levelname)s - %%(message)s -SIMPLE_LOG_FORMAT = %%(asctime)s %%(levelname)s - %%(message)s +log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s +log_format_with_pid = [%%(asctime)s] [%%(process)d] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s +log_format_with_thread_name = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(threadName)s %%(levelname)s - %%(message)s +simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s # Size of logging buffer logging_buffer_size = 4096 http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/e870a8e2/airflow/settings.py ---------------------------------------------------------------------- diff --git a/airflow/settings.py b/airflow/settings.py index e7566bf..3f7560d 100644 --- a/airflow/settings.py +++ b/airflow/settings.py @@ -73,10 +73,10 @@ LOGGING_LEVEL = logging.INFO # the prefix to append to gunicorn worker processes after init GUNICORN_WORKER_READY_PREFIX = "[ready] " -LOG_FORMAT = conf.get('core', 'LOG_FORMAT') -LOG_FORMAT_WITH_PID = conf.get('core', 'LOG_FORMAT_WITH_PID') -LOG_FORMAT_WITH_THREAD_NAME = conf.get('core', 'LOG_FORMAT_WITH_THREAD_NAME') -SIMPLE_LOG_FORMAT = conf.get('core', 'SIMPLE_LOG_FORMAT') +LOG_FORMAT = conf.get('core', 'log_format') +LOG_FORMAT_WITH_PID = conf.get('core', 'log_format_with_pid') +LOG_FORMAT_WITH_THREAD_NAME = conf.get('core', 'log_format_with_thread_name') +SIMPLE_LOG_FORMAT = conf.get('core', 'simple_log_format') AIRFLOW_HOME = None SQL_ALCHEMY_CONN = None
