aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Gareth Coles <[email protected]>2018-05-14 20:49:44 +0100
committerGravatar Gareth Coles <[email protected]>2018-05-14 20:49:44 +0100
commit8534bfaf3f75435e18489eb363bf04786ba79255 (patch)
tree55d3b0af6f899f9117b0afbc4b8b2b42fae9c72f
parentMigration runner and migrations (#69) (diff)
Gunicorn is super picky about when_ready arity
-rw-r--r--app_test.py2
-rw-r--r--gunicorn_config.py6
-rw-r--r--pysite/route_manager.py2
3 files changed, 7 insertions, 3 deletions
diff --git a/app_test.py b/app_test.py
index 96900ef3..150dd0b5 100644
--- a/app_test.py
+++ b/app_test.py
@@ -12,7 +12,7 @@ except KeyError:
pass
from app import manager
-from gunicorn_config import when_ready
+from gunicorn_config import _when_ready as when_ready
from pysite.constants import DISCORD_OAUTH_REDIRECT, DISCORD_OAUTH_AUTHORIZED
diff --git a/gunicorn_config.py b/gunicorn_config.py
index 00e5ccf0..37a91367 100644
--- a/gunicorn_config.py
+++ b/gunicorn_config.py
@@ -6,7 +6,11 @@ STRIP_REGEX = re.compile(r"<[^<]+?>")
WIKI_TABLE = "wiki"
-def when_ready(server=None, output_func=None):
+def when_ready(server=None):
+ _when_ready(server=server)
+
+
+def _when_ready(server=None, output_func=None):
""" server hook that only runs when the gunicorn master process loads """
if server:
diff --git a/pysite/route_manager.py b/pysite/route_manager.py
index f99a4736..a666ce09 100644
--- a/pysite/route_manager.py
+++ b/pysite/route_manager.py
@@ -6,7 +6,7 @@ import os
from flask import Blueprint, Flask, _request_ctx_stack
from flask_dance.contrib.discord import make_discord_blueprint
from flask_sockets import Sockets
-from gunicorn_config import when_ready
+from gunicorn_config import _when_ready as when_ready
from pysite.base_route import APIView, BaseView, ErrorView, RouteView
from pysite.constants import (