From 6b39ca5fdf12a8bbef8ee82a5412e49b41a4d98d Mon Sep 17 00:00:00 2001 From: Daniel Standish <15932138+dstandish@users.noreply.github.com> Date: Fri, 5 May 2023 11:45:50 -0700 Subject: [PATCH] Move interleave_timestamp_parser config to section logging --- airflow/configuration.py | 1 + airflow/utils/log/file_task_handler.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airflow/configuration.py b/airflow/configuration.py index c5d4920f060c8..d01d70d6e9a32 100644 --- a/airflow/configuration.py +++ b/airflow/configuration.py @@ -177,6 +177,7 @@ class AirflowConfigParser(ConfigParser): # DeprecationWarning will be issued and the old option will be used instead deprecated_options: dict[tuple[str, str], tuple[str, str, str]] = { ("celery", "worker_precheck"): ("core", "worker_precheck", "2.0.0"), + ("logging", "interleave_timestamp_parser"): ("core", "interleave_timestamp_parser", "2.6.1"), ("logging", "base_log_folder"): ("core", "base_log_folder", "2.0.0"), ("logging", "remote_logging"): ("core", "remote_logging", "2.0.0"), ("logging", "remote_log_conn_id"): ("core", "remote_log_conn_id", "2.0.0"), diff --git a/airflow/utils/log/file_task_handler.py b/airflow/utils/log/file_task_handler.py index d3e87ae0653b1..dcd22f557bcb7 100644 --- a/airflow/utils/log/file_task_handler.py +++ b/airflow/utils/log/file_task_handler.py @@ -96,7 +96,7 @@ def _fetch_logs_from_service(url, log_relative_path): return response -_parse_timestamp = conf.getimport("core", "interleave_timestamp_parser", fallback=None) +_parse_timestamp = conf.getimport("logging", "interleave_timestamp_parser", fallback=None) if not _parse_timestamp: