convert webdav as plaster pastedeploy app

development.ini.sample

@@ -2,7 +2,9 @@
 # app configuration
 # https://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
 ###
-[app:main]
+[pipeline:main]
+pipeline = tracim_web
+[app:tracim_web]
 use = egg:tracim_backend
 
 pyramid.reload_templates = true
@@ -13,6 +15,12 @@ pyramid.default_locale_name = en
 pyramid.includes =
     pyramid_debugtoolbar
 
+[pipeline:webdav]
+pipeline = tracim_webdav
+[app:tracim_webdav]
+use = egg:tracim_backend#webdav
+
+[DEFAULT]
 sqlalchemy.url = sqlite:///%(here)s/tracim.sqlite
 
 retry.attempts = 3

setup.py

@@ -89,7 +89,8 @@ setup(
     install_requires=requires,
     entry_points={
         'paste.app_factory': [
-            'main = tracim:main',
+            'main = tracim:web',
+            'webdav = tracim:webdav'
         ],
         'console_scripts': [
             'tracimcli = tracim.command:main',

tracim/__init__.py

@@ -13,15 +13,18 @@ from tracim.lib.utils.authentification import basic_auth_check_credentials
 from tracim.lib.utils.authentification import BASIC_AUTH_WEBUI_REALM
 from tracim.lib.utils.authorization import AcceptAllAuthorizationPolicy
 from tracim.lib.utils.authorization import TRACIM_DEFAULT_PERM
+from tracim.lib.webdav import WebdavAppFactory
 from tracim.views import BASE_API_V2
 from tracim.views.core_api.session_controller import SessionController
 from tracim.views.errors import ErrorSchema
 from tracim.lib.utils.cors import add_cors_support
 
 
-def main(global_config, **settings):
+def web(global_config, **local_settings):
     """ This function returns a Pyramid WSGI application.
     """
+    settings = global_config
+    settings.update(local_settings)
     # set CFG object
     app_config = CFG(settings)
     app_config.configure_filedepot()
@@ -64,3 +67,12 @@ def main(global_config, **settings):
         'API of Tracim v2',
     )
     return configurator.make_wsgi_app()
+
+
+def webdav(global_config, **local_settings):
+    settings = global_config
+    settings.update(local_settings)
+    app_factory = WebdavAppFactory(
+        tracim_config_file_path=settings['__file__'],
+    )
+    return app_factory.get_wsgi_app()

tracim/lib/webdav/__init__.py

@@ -48,7 +48,10 @@ class WebdavAppFactory(object):
         # Get pyramid Env
         tracim_config_file_path = os.path.abspath(tracim_config_file_path)
         config['tracim_config'] = tracim_config_file_path
-        settings = get_appsettings(config['tracim_config'])
+        global_conf = get_appsettings(config['tracim_config']).global_conf
+        local_conf = get_appsettings(config['tracim_config'], 'tracim_web')
+        settings = global_conf
+        settings.update(local_conf)
         app_config = CFG(settings)
 
         default_config_file = os.path.abspath(settings['wsgidav.config_path'])

tracim/lib/webdav/middlewares.py

@@ -256,7 +256,10 @@ class TracimEnv(BaseMiddleware):
         super().__init__(application, config)
         self._application = application
         self._config = config
-        self.settings = get_appsettings(config['tracim_config'])
+        global_conf = get_appsettings(config['tracim_config']).global_conf
+        local_conf = get_appsettings(config['tracim_config'], 'tracim_web')
+        self.settings = global_conf
+        self.settings.update(local_conf)
         self.engine = get_engine(self.settings)
         self.session_factory = get_session_factory(self.engine)
         self.app_config = CFG(self.settings)

wsgi/__init__.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import plaster
 import pyramid.paster
 
 from tracim.lib.webdav import WebdavAppFactory
@@ -10,7 +11,7 @@ def web_app(config_uri):
 
 
 def webdav_app(config_uri):
-    app_factory = WebdavAppFactory(
-        tracim_config_file_path=config_uri,
-    )
-    return app_factory.get_wsgi_app()
+    config_uri = '{}#webdav'.format(config_uri)
+    plaster.setup_logging(config_uri)
+    loader = plaster.get_loader(config_uri, protocols=['wsgi'])
+    return loader.get_wsgi_app()

wsgi/webdav.py

@@ -1,7 +1,6 @@
 # coding=utf-8
 # Runner for uwsgi
 import os
-
 from wsgi import webdav_app
 
 config_uri = os.environ['TRACIM_CONF_PATH']