diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-01 16:59:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-12-01 16:59:22 -0600 |
| commit | 8e2af2843f2de273f75cc1351bb87a905a11fb92 (patch) | |
| tree | c074b1fc692e50c95c2f44fad345cccf58823adc /mediagoblin/app.py | |
| parent | c7e1fee1b8eab3c01266c9a349812db598ca8f07 (diff) | |
| parent | 72567762e36c849ffe8172b6cea4ca1be682e511 (diff) | |
| download | mediagoblin-8e2af2843f2de273f75cc1351bb87a905a11fb92.tar.lz mediagoblin-8e2af2843f2de273f75cc1351bb87a905a11fb92.tar.xz mediagoblin-8e2af2843f2de273f75cc1351bb87a905a11fb92.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index aafadd97..7f087ed9 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -107,12 +107,6 @@ class MediaGoblinApp(object): def __call__(self, environ, start_response): request = Request(environ) - # pass the request through our meddleware classes - for m in self.meddleware: - 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) @@ -164,6 +158,13 @@ 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 |