You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by cr...@apache.org on 2017/03/29 21:15:17 UTC
[3/3] incubator-airflow git commit: [AIRFLOW-832] Let debug server
run without SSL
[AIRFLOW-832] Let debug server run without SSL
Closes #2051 from gsakkis/fix-debug-server
(cherry picked from commit b0ae70d3a8e935dc9266b6853683ae5375a7390b)
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/eb12f016
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/eb12f016
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/eb12f016
Branch: refs/heads/v1-8-test
Commit: eb12f0164fbeedbe2701744c213cc90e6fc805f5
Parents: 46ca569
Author: George Sakkis <ge...@gmail.com>
Authored: Sun Feb 12 16:09:26 2017 -0500
Committer: Chris Riccomini <cr...@apache.org>
Committed: Wed Mar 29 14:12:06 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/eb12f016/airflow/bin/cli.py
----------------------------------------------------------------------
diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
index 61d8707..e9c54e6 100755
--- a/airflow/bin/cli.py
+++ b/airflow/bin/cli.py
@@ -751,7 +751,7 @@ def webserver(args):
"Starting the web server on port {0} and host {1}.".format(
args.port, args.hostname))
app.run(debug=True, port=args.port, host=args.hostname,
- ssl_context=(ssl_cert, ssl_key))
+ ssl_context=(ssl_cert, ssl_key) if ssl_cert and ssl_key else None)
else:
pid, stdout, stderr, log_file = setup_locations("webserver", pid=args.pid)
print(