better runner, use wsgidav.config_file param instead of env var

tracim/command/webdav.py

@@ -6,6 +6,7 @@ from waitress import serve
 
 from tracim.command import AppContextCommand
 from tracim.lib.webdav import WebdavAppFactory
+from wsgi import webdav_app
 
 
 class WebdavRunnerCommand(AppContextCommand):
@@ -22,8 +23,5 @@ class WebdavRunnerCommand(AppContextCommand):
         super(WebdavRunnerCommand, self).take_action(parsed_args)
         tracim_config = parsed_args.config_file
         # TODO - G.M - 16-04-2018 - Allow specific webdav config file
-        app_factory = WebdavAppFactory(
-            tracim_config_file_path=tracim_config,
-        )
-        app = app_factory.get_wsgi_app()
+        app = webdav_app(tracim_config)
         serve(app, port=app.config['port'], host=app.config['host'])

tracim/lib/webdav/__init__.py

@@ -27,22 +27,17 @@ from tracim.models import get_engine, get_session_factory
 class WebdavAppFactory(object):
 
     def __init__(self,
-                 webdav_config_file_path: str = None,
                  tracim_config_file_path: str = None,
                  ):
         self.config = self._initConfig(
-            webdav_config_file_path,
             tracim_config_file_path
         )
 
     def _initConfig(self,
-                    webdav_config_file_path: str = None,
                     tracim_config_file_path: str = None
                     ):
         """Setup configuration dictionary from default,
          command line and configuration file."""
-        if not webdav_config_file_path:
-            webdav_config_file_path = DEFAULT_WEBDAV_CONFIG_FILE
         if not tracim_config_file_path:
             tracim_config_file_path = DEFAULT_TRACIM_CONFIG_FILE
 
@@ -50,20 +45,20 @@ class WebdavAppFactory(object):
         config = DEFAULT_CONFIG.copy()
         temp_verbose = config["verbose"]
 
-        default_config_file = os.path.abspath(webdav_config_file_path)
-        webdav_config_file = self._readConfigFile(
-            webdav_config_file_path,
-            temp_verbose
-            )
-        # Configuration file overrides defaults
-        config.update(webdav_config_file)
-
         # 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'])
         app_config = CFG(settings)
 
+        default_config_file = os.path.abspath(settings['wsgidav.config_path'])
+        webdav_config_file = self._readConfigFile(
+            default_config_file,
+            temp_verbose
+            )
+        # Configuration file overrides defaults
+        config.update(webdav_config_file)
+
         if not useLxml and config["verbose"] >= 1:
             print(
                 "WARNING: Could not import lxml: using xml instead (slower). "

wsgi/__init__.py

@@ -0,0 +1,16 @@
+# coding=utf-8
+import pyramid.paster
+
+from tracim.lib.webdav import WebdavAppFactory
+
+
+def web_app(config_uri):
+    pyramid.paster.setup_logging(config_uri)
+    return pyramid.paster.get_app(config_uri)
+
+
+def webdav_app(config_uri):
+    app_factory = WebdavAppFactory(
+        tracim_config_file_path=config_uri,
+    )
+    return app_factory.get_wsgi_app()

wsgi/web.py

@@ -1,9 +1,7 @@
 # coding=utf-8
 # Runner for uwsgi
 import os
-import pyramid.paster
+from wsgi import web_app
 
 config_uri = os.environ['TRACIM_CONF_PATH']
-
-pyramid.paster.setup_logging(config_uri)
-application = pyramid.paster.get_app(config_uri)
+application = web_app(config_uri)

wsgi/webdav.py

@@ -1,12 +1,8 @@
 # coding=utf-8
 # Runner for uwsgi
-from tracim.lib.webdav import WebdavAppFactory
 import os
 
+from wsgi import webdav_app
+
 config_uri = os.environ['TRACIM_CONF_PATH']
-webdav_config_uri = os.environ['TRACIM_WEBDAV_CONF_PATH']
-app_factory = WebdavAppFactory(
-    tracim_config_file_path=config_uri,
-    webdav_config_file_path=webdav_config_uri,
-)
-application = app_factory.get_wsgi_app()
+application = webdav_app(config_uri)