This is an automated email from the ASF dual-hosted git repository. ephraimanierobi pushed a commit to branch v2-6-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit dba333173754f6beae0857b4a996e864029c541f Author: Daniel Standish <[email protected]> AuthorDate: Sat May 6 08:56:16 2023 -0700 Move interleave_timestamp_parser config to section logging (#31102) (cherry picked from commit 94c24a1986b2a3a73c871683a555833ad244dd0d) --- 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 c5d4920f06..d01d70d6e9 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 d3e87ae065..dcd22f557b 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:
