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 2016/05/12 17:35:36 UTC
incubator-airflow git commit: Revert "ssl gunicorn support"
Repository: incubator-airflow
Updated Branches:
refs/heads/master e332f6362 -> 31f01b838
Revert "ssl gunicorn support"
This reverts commit e332f63620a5f85e38c4a1a5ac9c9a4a5bfc6035.
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/31f01b83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/31f01b83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/31f01b83
Branch: refs/heads/master
Commit: 31f01b83809e7a36c3e92ce91fdbde1659a6cbc6
Parents: e332f63
Author: Chris Riccomini <ch...@wepay.com>
Authored: Thu May 12 10:35:28 2016 -0700
Committer: Chris Riccomini <ch...@wepay.com>
Committed: Thu May 12 10:35:28 2016 -0700
----------------------------------------------------------------------
airflow/bin/cli.py | 21 ++++-----------------
airflow/configuration.py | 8 --------
2 files changed, 4 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/31f01b83/airflow/bin/cli.py
----------------------------------------------------------------------
diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
index f2dceee..d735bad 100755
--- a/airflow/bin/cli.py
+++ b/airflow/bin/cli.py
@@ -410,17 +410,10 @@ def webserver(args):
app.run(debug=True, port=args.port, host=args.hostname)
else:
pid, stdout, stderr, log_file = setup_locations("webserver", pid=args.pid)
- secure_params = args.ssl_certfile and args.ssl_keyfile
- if secure_params:
- sec_params = ['--certfile=' + args.ssl_certfile, '--keyfile=' +
- args.ssl_keyfile]
- else:
- sec_params = []
print(
'Running the Gunicorn server with {workers} {args.workerclass}'
'workers on host {args.hostname} and port '
- '{args.port} with a timeout of {worker_timeout},'
- ' secure={secure_params}'.format(**locals()))
+ '{args.port} with a timeout of {worker_timeout}...'.format(**locals()))
run_args = ['gunicorn',
'-w ' + str(args.workers),
@@ -428,7 +421,7 @@ def webserver(args):
'-t ' + str(args.worker_timeout),
'-b ' + args.hostname + ':' + str(args.port),
'-n ' + 'airflow-webserver',
- '-p ' + str(pid)] + sec_params
+ '-p ' + str(pid)]
if args.daemon:
run_args.append("-D")
@@ -783,12 +776,6 @@ class CLIFactory(object):
("-hn", "--hostname"),
default=conf.get('webserver', 'WEB_SERVER_HOST'),
help="Set the hostname on which to run the web server"),
- 'ssl_certfile': Arg(
- ("-scf", "--ssl_certfile"),
- help="ssl certificate file"),
- 'ssl_keyfile': Arg(
- ("-skf", "--ssl_keyfile"),
- help="ssl key file"),
'debug': Arg(
("-d", "--debug"),
"Use the server that ships with Flask in debug mode",
@@ -915,8 +902,8 @@ class CLIFactory(object):
'func': webserver,
'help': "Start a Airflow webserver instance",
'args': ('port', 'workers', 'workerclass', 'worker_timeout', 'hostname',
- 'pid', 'daemon', 'stdout', 'stderr', 'log_file','ssl_certfile',
- 'ssl_keyfile', 'debug'),
+ 'pid', 'daemon', 'stdout', 'stderr', 'log_file',
+ 'debug'),
}, {
'func': resetdb,
'help': "Burn down and rebuild the metadata database",
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/31f01b83/airflow/configuration.py
----------------------------------------------------------------------
diff --git a/airflow/configuration.py b/airflow/configuration.py
index 6478891..173eddb 100644
--- a/airflow/configuration.py
+++ b/airflow/configuration.py
@@ -109,8 +109,6 @@ defaults = {
'expose_config': False,
'workers': 4,
'worker_class': 'sync',
- 'ssl_certfile': None,
- 'ssl_keyfile': None,
},
'scheduler': {
'statsd_on': False,
@@ -265,12 +263,6 @@ authenticate = False
# Filter the list of dags by owner name (requires authentication to be enabled)
filter_by_owner = False
-# SSL certificate file
-# ssl_certfile =
-
-# SSL key file
-# ssl_keyfile =
-
[email]
email_backend = airflow.utils.email.send_email_smtp