diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2016-02-17 17:39:32 -0800 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2016-02-19 10:22:14 -0800 |
| commit | d61778a489f606f1bff4f01f250a0e3c4fb99e27 (patch) | |
| tree | a4fe3a6a33ed9368476d452c5eab7a6e9c2238a1 /mediagoblin | |
| parent | 149f46f7d596fa9f61dca915845ba9318b327fdd (diff) | |
| download | mediagoblin-d61778a489f606f1bff4f01f250a0e3c4fb99e27.tar.lz mediagoblin-d61778a489f606f1bff4f01f250a0e3c4fb99e27.tar.xz mediagoblin-d61778a489f606f1bff4f01f250a0e3c4fb99e27.zip | |
Switch from Paste for serving to Waitress
Incredibly, it looks like none of our documentation has to change taking
this route...!
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/app.py | 31 | ||||
| -rw-r--r-- | mediagoblin/gmg_commands/serve.py | 1 | ||||
| -rw-r--r-- | mediagoblin/tests/test_paste.ini | 2 |
3 files changed, 1 insertions, 33 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index b9846962..345aa048 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -365,34 +365,3 @@ def paste_app_factory(global_config, **app_config): mgoblin_app = hook_transform('wrap_wsgi', mgoblin_app) return mgoblin_app - - -def paste_server_selector(wsgi_app, global_config=None, **app_config): - """ - Select between gunicorn and paste depending on what ia available - """ - # See if we can import the gunicorn server... - # otherwise we'll use the paste server - try: - import gunicorn - except ImportError: - gunicorn = None - - if gunicorn is None: - # use paste - from paste.httpserver import server_runner - - cleaned_app_config = dict( - [(key, app_config[key]) - for key in app_config - if key in ["host", "port", "handler", "ssl_pem", "ssl_context", - "server_version", "protocol_version", "start_loop", - "daemon_threads", "socket_timeout", "use_threadpool", - "threadpool_workers", "threadpool_options", - "request_queue_size"]]) - - return server_runner(wsgi_app, global_config, **cleaned_app_config) - else: - # use gunicorn - from gunicorn.app.pasterapp import PasterServerApplication - return PasterServerApplication(wsgi_app, global_config, **app_config) diff --git a/mediagoblin/gmg_commands/serve.py b/mediagoblin/gmg_commands/serve.py index 64400fdd..6ded1cfc 100644 --- a/mediagoblin/gmg_commands/serve.py +++ b/mediagoblin/gmg_commands/serve.py @@ -29,7 +29,6 @@ class ServeCommand(object): return loadapp(app_spec, name=name, relative_to=relative_to, **kwargs) def daemonize(self): - # TODO: pass to gunicorn if available pass def restart_with_reloader(self): diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini index 8d75c3cb..1c5f09fa 100644 --- a/mediagoblin/tests/test_paste.ini +++ b/mediagoblin/tests/test_paste.ini @@ -13,6 +13,6 @@ config = %(here)s/mediagoblin.ini CELERY_ALWAYS_EAGER = true [server:main] -use = egg:gunicorn +use = egg:waitress#main host = 127.0.0.1 port = 6543 |