[AIRFLOW-6703] The base_log_folder option moved to logging in ci (apa…

…che#7320) The option is raising deprecation warnings currently
astronomer · Feb 2, 2020 · cbcc22a · cbcc22a
1 parent f757a54
commit cbcc22a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/scripts/ci/in_container/airflow_ci.cfg b/scripts/ci/in_container/airflow_ci.cfg
@@ -18,7 +18,6 @@
 
 [core]
 dags_folder = ~/airflow/dags
-base_log_folder = ~/airflow/logs
 executor = LocalExecutor
 sql_alchemy_conn = # overridden by the startup scripts
 unit_test_mode = True
@@ -32,6 +31,9 @@ fernet_key = af7CN0q6ag5U3g08IsPsw3K45U7Xa0axgVFhoh-3zB8=
 [hive]
 default_hive_mapred_queue = airflow
 
+[logging]
+base_log_folder = ~/airflow/logs
+
 [smtp]
 smtp_user = airflow
 smtp_password = airflow

diff --git a/scripts/ci/in_container/kubernetes/app/templates/configmaps.template.yaml b/scripts/ci/in_container/kubernetes/app/templates/configmaps.template.yaml
@@ -24,14 +24,16 @@ data:
   airflow.cfg: |
     [core]
     dags_folder = {{CONFIGMAP_DAGS_FOLDER}}
-    base_log_folder = /root/airflow/logs
-    logging_level = INFO
     executor = KubernetesExecutor
     parallelism = 32
     load_examples = False
     plugins_folder = /root/airflow/plugins
     sql_alchemy_conn = $SQL_ALCHEMY_CONN
 
+    [logging]
+    base_log_folder = /root/airflow/logs
+    logging_level = INFO
+
     [scheduler]
     dag_dir_list_interval = 300
     child_process_log_directory = /root/airflow/logs/scheduler

diff --git a/tests/utils/test_serve_logs.py b/tests/utils/test_serve_logs.py
@@ -31,7 +31,7 @@
 
 class TestServeLogs(unittest.TestCase):
     def test_should_serve_file(self):
-        log_dir = os.path.expanduser(conf.get('core', 'BASE_LOG_FOLDER'))
+        log_dir = os.path.expanduser(conf.get('logging', 'BASE_LOG_FOLDER'))
         log_port = conf.get('celery', 'WORKER_LOG_SERVER_PORT')
         with NamedTemporaryFile(dir=log_dir) as f:
             f.write(LOG_DATA.encode())