ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1931 from normanjaeckel/LocalHostVar

Browse Source 
Refactored logic in autoupdate.py concerning wsgi network connection …
This commit is contained in:
Oskar Hahn 2016-02-01 21:27:13 +01:00
commit a2d8b41d55
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openslides/utils/autoupdate.py
View File

@ -97,15 +97,14 @@ class OpenSlidesSockJSConnection(SockJSConnection):
object_url.
"""
# Join network location with object URL.
if RUNNING_HOST == '0.0.0.0':
# Windows can not connect to 0.0.0.0. So connect to localhost instead
local_host = 'localhost'
if settings.OPENSLIDES_WSGI_NETWORK_LOCATION:
wsgi_network_location = settings.OPENSLIDES_WSGI_NETWORK_LOCATION
else:
local_host = RUNNING_HOST
wsgi_network_location = (
settings.OPENSLIDES_WSGI_NETWORK_LOCATION or
'http://{}:{}'.format(local_host, RUNNING_PORT))
if RUNNING_HOST == '0.0.0.0':
# Windows can not connect to 0.0.0.0, so connect to localhost instead.
wsgi_network_location = 'http://localhost:{}'.format(RUNNING_PORT)
else:
wsgi_network_location = 'http://{}:{}'.format(RUNNING_HOST, RUNNING_PORT)
url = ''.join((wsgi_network_location, object_url))
# Send out internal HTTP request to get data from the REST api.