Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed how the webclient looks up the webcocket_url. This auto-lookups the url while still respecting a custom given settings.WEBSOCKET_CLIENT_URL (for proxy setups?). This means settings.WEBSOCKET_CLIENT_URL is now defaulting to None. Resolves #806.

Browse source
This commit is contained in:
Griatch 2015-09-27 09:57:23 +02:00
parent 27bde5129b
commit 5429ede5f7
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/web/utils/general_context.py
View file

@ -31,7 +31,8 @@ WEBSITE = ['Flatpages', 'News', 'Sites']
# The main context processor function
WEBCLIENT_ENABLED = settings.WEBCLIENT_ENABLED
WEBSOCKET_CLIENT_ENABLED = settings.WEBSOCKET_CLIENT_ENABLED
WSURL = "%s:%s" % (settings.WEBSOCKET_CLIENT_URL, settings.WEBSOCKET_CLIENT_PORT)
WEBSOCKET_PORT = settings.WEBSOCKET_CLIENT_PORT
WEBSOCKET_URL = settings.WEBSOCKET_CLIENT_URL
def general_context(request):
"""
@ -48,5 +49,6 @@ def general_context(request):
'evennia_websiteapps':WEBSITE,
"webclient_enabled" : WEBCLIENT_ENABLED,
"websocket_enabled" : WEBSOCKET_CLIENT_ENABLED,
"websocket_url" : WSURL
"websocket_port" : WEBSOCKET_PORT,
"websocket_url" : WEBSOCKET_URL
}