Commit ce0c3a57 authored by Marcel Rieger's avatar Marcel Rieger
Browse files

Refine extension config merging.

parent 23c2d4bf
......@@ -300,9 +300,14 @@ class Server(object):
logger.info("mount app")
app_config = self.__default_mount_config
# merge extension config into app config
for extension in self._extensions.values():
app_config["/extensions/" + extension.name()] = extension.config()
# config is structured for multiple mountpoints
for mount, conf in extension.config().items():
key = "/extensions/%s%s" % (extension.name(), "" if mount == "/" else mount)
app_config[key] = conf
self.__application = cherrypy.tree.mount(self.controller, script_name, app_config)
if os.path.isfile(cherrypy_conf):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment