airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From criccom...@apache.org
Subject incubator-airflow git commit: [AIRFLOW-206] Always load local log files if they exist
Date Sat, 04 Jun 2016 17:11:20 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master c78101eaa -> 275aa15fa


[AIRFLOW-206] Always load local log files if they exist


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

Branch: refs/heads/master
Commit: 275aa15faec0eb98e870709e2fb2a146b5a809cd
Parents: c78101e
Author: Dante De Nigris <dante.denigris@gmail.com>
Authored: Sat Jun 4 10:10:06 2016 -0700
Committer: Chris Riccomini <chrisr@wepay.com>
Committed: Sat Jun 4 10:10:14 2016 -0700

----------------------------------------------------------------------
 airflow/configuration.py | 2 +-
 airflow/www/views.py     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/275aa15f/airflow/configuration.py
----------------------------------------------------------------------
diff --git a/airflow/configuration.py b/airflow/configuration.py
index c1bb53d..3193fbf 100644
--- a/airflow/configuration.py
+++ b/airflow/configuration.py
@@ -122,7 +122,7 @@ defaults = {
         'secret_key': 'airflowified',
         'expose_config': False,
         'workers': 4,
-        'worker_class': 'sync',
+        'worker_class': 'sync'
     },
     'scheduler': {
         'statsd_on': False,

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/275aa15f/airflow/www/views.py
----------------------------------------------------------------------
diff --git a/airflow/www/views.py b/airflow/www/views.py
index bba417b..522c4ce 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -837,15 +837,15 @@ class Airflow(BaseView):
         if ti:
             host = ti.hostname
             log_loaded = False
-
-            if socket.getfqdn() == host:
+            
+            if os.path.exists(loc):
                 try:
                     f = open(loc)
                     log += "".join(f.readlines())
                     f.close()
                     log_loaded = True
                 except:
-                    log = "*** Local log file not found.\n".format(loc)
+                    log = "*** Failed to load local log file: {0}.\n".format(loc)
             else:
                 WORKER_LOG_SERVER_PORT = \
                     conf.get('celery', 'WORKER_LOG_SERVER_PORT')


Mime
View raw message