feng-tao closed pull request #3944: [AIRFLOW-3111] Fix instructions in
UPDATING.md and remove comment artifacts
URL: https://github.com/apache/incubator-airflow/pull/3944
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/UPDATING.md b/UPDATING.md
index 4fd45b2c0e..93ea069838 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -134,11 +134,11 @@ With Airflow 1.9 or lower, `FILENAME_TEMPLATE`,
`PROCESSOR_FILENAME_TEMPLATE`, `
```
[core]
fab_logging_level = WARN
-log_filename_template = {{{{ ti.dag_id }}}}/{{{{ ti.task_id }}}}/{{{{ ts
}}}}/{{{{ try_number }}}}.log
-log_processor_filename_template = {{{{ filename }}}}.log
+log_filename_template = {{ ti.dag_id }}/{{ ti.task_id }}/{{ ts }}/{{
try_number }}.log
+log_processor_filename_template = {{ filename }}.log
[elasticsearch]
-elasticsearch_log_id_template =
{{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}
+elasticsearch_log_id_template =
{dag_id}-{task_id}-{execution_date}-{try_number}
elasticsearch_end_of_log_mark = end_of_log
```
diff --git a/airflow/config_templates/default_airflow.cfg
b/airflow/config_templates/default_airflow.cfg
index 8d068c5428..0028d7832f 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -62,12 +62,10 @@ fab_logging_level = WARN
logging_config_class =
# Log format
-# we need to escape the curly braces by adding an additional curly brace
log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s -
%%(message)s
simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s
# Log filename format
-# we need to escape the curly braces by adding an additional curly brace
log_filename_template = {{{{ ti.dag_id }}}}/{{{{ ti.task_id }}}}/{{{{ ts
}}}}/{{{{ try_number }}}}.log
log_processor_filename_template = {{{{ filename }}}}.log
@@ -561,7 +559,6 @@ hide_sensitive_variable_fields = True
[elasticsearch]
elasticsearch_host =
-# we need to escape the curly braces by adding an additional curly brace
elasticsearch_log_id_template =
{{dag_id}}-{{task_id}}-{{execution_date}}-{{try_number}}
elasticsearch_end_of_log_mark = end_of_log
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
