Fix #13: wsgi app init

bird-house · May 3, 2018 · c0eabb6 · c0eabb6
1 parent 5f85234
commit c0eabb6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/hummingbird/__init__.py b/hummingbird/__init__.py
@@ -1,11 +1,3 @@
-import os
-from pywps.app.Service import Service
-
-from hummingbird.processes import processes
+from .wsgi import application
 
 __version__ = "0.5_dev"
-
-
-def application(environ, start_response):
-    app = Service(processes, [os.environ.get('PYWPS_CFG')])
-    return app(environ, start_response)
diff --git a/hummingbird/wsgi.py b/hummingbird/wsgi.py
@@ -0,0 +1,17 @@
+import os
+from pywps.app.Service import Service
+
+from .processes import processes
+
+
+def create_app(cfgfiles=None):
+    config_files = [os.path.join(os.path.dirname(__file__), 'default.cfg')]
+    if cfgfiles:
+        config_files.extend(cfgfiles)
+    if 'PYWPS_CFG' in os.environ:
+        config_files.append(os.environ['PYWPS_CFG'])
+    service = Service(processes=processes, cfgfiles=config_files)
+    return service
+
+
+application = create_app()