You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by fo...@apache.org on 2018/03/28 11:37:06 UTC
incubator-airflow git commit: [AIRFLOW-2261] Check config/env for
remote base log folder
Repository: incubator-airflow
Updated Branches:
refs/heads/master 6b9126733 -> 02eff2848
[AIRFLOW-2261] Check config/env for remote base log folder
Closes #3166 from brandonwillard/add-remote-base-
env-var
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/02eff284
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/02eff284
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/02eff284
Branch: refs/heads/master
Commit: 02eff2848b06645067c5fa9ccaa4f04c7ab174d9
Parents: 6b91267
Author: Brandon T. Willard <br...@gmail.com>
Authored: Wed Mar 28 13:36:59 2018 +0200
Committer: Fokko Driesprong <fo...@godatadriven.com>
Committed: Wed Mar 28 13:36:59 2018 +0200
----------------------------------------------------------------------
airflow/config_templates/airflow_local_settings.py | 2 +-
airflow/config_templates/default_airflow.cfg | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/02eff284/airflow/config_templates/airflow_local_settings.py
----------------------------------------------------------------------
diff --git a/airflow/config_templates/airflow_local_settings.py b/airflow/config_templates/airflow_local_settings.py
index b72f999..3086cf0 100644
--- a/airflow/config_templates/airflow_local_settings.py
+++ b/airflow/config_templates/airflow_local_settings.py
@@ -41,7 +41,7 @@ PROCESSOR_FILENAME_TEMPLATE = '{{ filename }}.log'
# s3 buckets should start with "s3://"
# gcs buckets should start with "gs://"
# wasb buckets should start with "wasb" just to help Airflow select correct handler
-REMOTE_BASE_LOG_FOLDER = ''
+REMOTE_BASE_LOG_FOLDER = conf.get('core', 'REMOTE_BASE_LOG_FOLDER')
DEFAULT_LOGGING_CONFIG = {
'version': 1,
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/02eff284/airflow/config_templates/default_airflow.cfg
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
index cc3e89f..eb2981f 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -41,6 +41,7 @@ base_log_folder = {AIRFLOW_HOME}/logs
# configuration requirements.
remote_logging = False
remote_log_conn_id =
+remote_base_log_folder =
encrypt_s3_logs = False
# Logging level