airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davy...@apache.org
Subject incubator-airflow git commit: [AIRFLOW-1248] Fix wrong conf name for worker timeout
Date Fri, 26 May 2017 18:17:19 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master d165377d2 -> 92314f33f


[AIRFLOW-1248] Fix wrong conf name for worker timeout

The parameter `web_server_worker_timeout` is
wrongly
referenced by airflow/bin/cli.py. This PR fixes
it.

Closes #2328 from sekikn/AIRFLOW-1248


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

Branch: refs/heads/master
Commit: 92314f33feb60b91dd8f29af1ad526978a49446a
Parents: d165377
Author: Kengo Seki <sekikn@apache.org>
Authored: Fri May 26 11:16:19 2017 -0700
Committer: Dan Davydov <dan.davydov@airbnb.com>
Committed: Fri May 26 11:16:23 2017 -0700

----------------------------------------------------------------------
 airflow/bin/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/92314f33/airflow/bin/cli.py
----------------------------------------------------------------------
diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
index e43907e..6aa7119 100755
--- a/airflow/bin/cli.py
+++ b/airflow/bin/cli.py
@@ -736,7 +736,7 @@ def webserver(args):
     error_logfile = args.error_logfile or conf.get('webserver', 'error_logfile')
     num_workers = args.workers or conf.get('webserver', 'workers')
     worker_timeout = (args.worker_timeout or
-                      conf.get('webserver', 'webserver_worker_timeout'))
+                      conf.get('webserver', 'web_server_worker_timeout'))
     ssl_cert = args.ssl_cert or conf.get('webserver', 'web_server_ssl_cert')
     ssl_key = args.ssl_key or conf.get('webserver', 'web_server_ssl_key')
     if not ssl_cert and ssl_key:


Mime
View raw message