[AIRFLOW-1337] Allow log format customization via airflow.cfg

Closes apache#2392 from ronfung/customize-logging-thru-config
wndhydrnt · Jun 23, 2017 · 4841e3e · 4841e3e
1 parent ebed532
commit 4841e3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
@@ -49,6 +49,12 @@ s3_log_folder =
 # Logging level
 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
+
 # Size of logging buffer
 logging_buffer_size = 4096
 # Logging level minimum to flush buffer before full

diff --git a/airflow/configuration.py b/airflow/configuration.py
@@ -42,7 +42,7 @@
 warnings.filterwarnings(
     action='default', category=PendingDeprecationWarning, module='airflow')
 
-ConfigParser = configparser.ConfigParser
+ConfigParser = configparser.SafeConfigParser
 
 
 def generate_fernet_key():

diff --git a/airflow/settings.py b/airflow/settings.py
@@ -73,14 +73,10 @@ def timing(cls, stat, dt):
 # the prefix to append to gunicorn worker processes after init
 GUNICORN_WORKER_READY_PREFIX = "[ready] "
 
-# can't move this to conf due to ConfigParser interpolation
-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 = 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