Merge pull request #2066 from trhr/proxy-plugins3

Fixing unintended consequences of proxy_plugins
This commit is contained in:
Griatch 2020-02-28 20:28:14 +01:00 committed by GitHub
commit f9df4e6541

View file

@ -388,8 +388,7 @@ if WEBSERVER_ENABLED:
webclientstr = "webclient-websocket%s: %s" % (w_ifacestr, port)
INFO_DICT["webclient"].append(webclientstr)
web_root = Website(web_root, logPath=settings.HTTP_LOG_FILE)
web_root.is_portal = True
if WEB_PLUGINS_MODULE:
try:
@ -399,7 +398,8 @@ if WEBSERVER_ENABLED:
"WARNING: WEB_PLUGINS_MODULE is enabled but at_webproxy_root_creation() not found - "
"copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf."
)
web_root = Website(web_root, logPath=settings.HTTP_LOG_FILE)
web_root.is_portal = True
proxy_service = internet.TCPServer(proxyport, web_root, interface=interface)
proxy_service.setName("EvenniaWebProxy%s:%s" % (ifacestr, proxyport))
PORTAL.services.addService(proxy_service)