airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joy...@apache.org
Subject [1/2] incubator-airflow git commit: [AIRFLOW-2197] Silence hostname_callable config error message
Date Thu, 08 Mar 2018 18:46:54 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master 7cc6d8a56 -> 48dab65ad


[AIRFLOW-2197] Silence hostname_callable config error message

Since the hostname_callable key is not defined in the config, we end
up with a lot of warnings. Add the key to the config and simplify the
code.


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/4af71fd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/4af71fd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/4af71fd5

Branch: refs/heads/master
Commit: 4af71fd58e5958ab7f3a5b8620f711037c194e71
Parents: b8c2cea
Author: Fokko Driesprong <fokkodriesprong@godatadriven.com>
Authored: Thu Mar 8 13:04:04 2018 +0100
Committer: Fokko Driesprong <fokkodriesprong@godatadriven.com>
Committed: Thu Mar 8 13:05:41 2018 +0100

----------------------------------------------------------------------
 .gitignore                                   | 1 +
 airflow/config_templates/default_airflow.cfg | 5 ++---
 airflow/config_templates/default_test.cfg    | 1 +
 scripts/ci/airflow_travis.cfg                | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4af71fd5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0a512df..a29c9ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+.pytest_cache
 
 # Translations
 *.mo

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4af71fd5/airflow/config_templates/default_airflow.cfg
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
index 5356af7..acfd15e 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -56,9 +56,8 @@ logging_config_class =
 log_format = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(levelname)s - %%(message)s
 simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s
 
-# Hostname override by providing a path to a callable.
-# hostname_callable = socket:getfqdn
-
+# Hostname by providing a path to a callable, which will resolve the hostname
+hostname_callable = socket:getfqdn
 
 # Default timezone in case supplied date times are naive
 # can be utc (default), system, or any IANA timezone string (e.g. Europe/Amsterdam)

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4af71fd5/airflow/config_templates/default_test.cfg
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_test.cfg b/airflow/config_templates/default_test.cfg
index eaf3d03..9016c2b 100644
--- a/airflow/config_templates/default_test.cfg
+++ b/airflow/config_templates/default_test.cfg
@@ -40,6 +40,7 @@ non_pooled_task_slot_count = 128
 enable_xcom_pickling = False
 killed_task_cleanup_time = 5
 secure_mode = False
+hostname_callable = socket:getfqdn
 
 [cli]
 api_client = airflow.api.client.local_client

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4af71fd5/scripts/ci/airflow_travis.cfg
----------------------------------------------------------------------
diff --git a/scripts/ci/airflow_travis.cfg b/scripts/ci/airflow_travis.cfg
index 03d7e59..0f4c1aa 100644
--- a/scripts/ci/airflow_travis.cfg
+++ b/scripts/ci/airflow_travis.cfg
@@ -25,6 +25,7 @@ dags_are_paused_at_creation = False
 default_impersonation =
 secure_mode = False
 fernet_key = af7CN0q6ag5U3g08IsPsw3K45U7Xa0axgVFhoh-3zB8=
+hostname_callable = socket:getfqdn
 
 [webserver]
 base_url = http://localhost:8080


Mime
View raw message