X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fapp.py;h=0a57c09101e7db3944b59f10f594ec93aaf6fdb9;hb=ff6933fa4c63611f8e3d512d6608767cbdece6ec;hp=ee646282ebea582b00575a7b8784c58b12b3a636;hpb=f693f9af88215b40ae7c7e2adb4f39fb7fd3b096;p=mediagoblin.git

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index ee646282..0a57c091 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,11 +16,12 @@
 
 import os
 import urllib
+import logging
 
 import routes
 from webob import Request, exc
 
-from mediagoblin import routing, middleware
+from mediagoblin import routing, meddleware, __version__
 from mediagoblin.tools import common, translate, template
 from mediagoblin.tools.response import render_404
 from mediagoblin.tools import request as mg_request
@@ -31,6 +32,9 @@ from mediagoblin.init import (get_jinja_loader, get_staticdirector,
     setup_storage, setup_beaker_cache)
 
 
+_log = logging.getLogger(__name__)
+
+
 class MediaGoblinApp(object):
     """
     WSGI application of MediaGoblin
@@ -47,6 +51,7 @@ class MediaGoblinApp(object):
            (Note: setting 'celery_setup_elsewhere' also disables
            setting up celery.)
         """
+        _log.info("GNU MediaGoblin %s main server starting", __version__)
         ##############
         # Setup config
         ##############
@@ -63,7 +68,7 @@ class MediaGoblinApp(object):
 
         # Get the template environment
         self.template_loader = get_jinja_loader(
-            app_config.get('user_template_path'))
+            app_config.get('local_templates'))
 
         # Set up storage systems
         self.public_store, self.queue_store = setup_storage()
@@ -94,26 +99,19 @@ class MediaGoblinApp(object):
         # object.
         #######################################################
 
-        setup_globals(app = self)
+        setup_globals(app=self)
 
         # Workbench *currently* only used by celery, so this only
         # matters in always eager mode :)
         setup_workbench()
 
-        # instantiate application middleware
-        self.middleware = [common.import_component(m)(self)
-                           for m in middleware.ENABLED_MIDDLEWARE]
-
+        # instantiate application meddleware
+        self.meddleware = [common.import_component(m)(self)
+                           for m in meddleware.ENABLED_MEDDLEWARE]
 
     def __call__(self, environ, start_response):
         request = Request(environ)
 
-        # pass the request through our middleware classes
-        for m in self.middleware:
-            response = m.process_request(request)
-            if response is not None:
-                return response(environ, start_response)
-
         ## Routing / controller loading stuff
         path_info = request.path_info
         route_match = self.routing.match(path_info)
@@ -129,6 +127,11 @@ class MediaGoblinApp(object):
         # The other option would be:
         # request.full_path = environ["SCRIPT_URL"]
 
+        # Fix up environ for urlgen
+        # See bug: https://bitbucket.org/bbangert/routes/issue/55/cache_hostinfo-breaks-on-https-off
+        if environ.get('HTTPS', '').lower() == 'off':
+            environ.pop('HTTPS')
+
         ## Attach utilities to the request object
         request.matchdict = route_match
         request.urlgen = routes.URLGenerator(self.routing, environ)
@@ -165,19 +168,44 @@ class MediaGoblinApp(object):
             return render_404(request)(environ, start_response)
 
         controller = common.import_component(route_match['controller'])
+
+        # pass the request through our meddleware classes
+        for m in self.meddleware:
+            response = m.process_request(request, controller)
+            if response is not None:
+                return response(environ, start_response)
+
         request.start_response = start_response
 
         # get the response from the controller
         response = controller(request)
 
-        # pass the response through the middleware
-        for m in self.middleware[::-1]:
+        # pass the response through the meddleware
+        for m in self.meddleware[::-1]:
             m.process_response(request, response)
 
+        # Reset the sql session, so that the next request
+        # gets a fresh session
+        try:
+            self.db.reset_after_request()
+        except TypeError:
+            # We're still on mongo
+            pass
+
         return response(environ, start_response)
 
 
 def paste_app_factory(global_config, **app_config):
-    mgoblin_app = MediaGoblinApp(app_config['config'])
+    configs = app_config['config'].split()
+    mediagoblin_config = None
+    for config in configs:
+        if os.path.exists(config) and os.access(config, os.R_OK):
+            mediagoblin_config = config
+            break
+
+    if not mediagoblin_config:
+        raise IOError("Usable mediagoblin config not found.")
+
+    mgoblin_app = MediaGoblinApp(mediagoblin_config)
 
     return mgoblin_app