From e7a8ef80229b238b7ae7ac1be38cc6115409d1ce Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 30 Oct 2011 15:45:41 +0000
Subject: [PATCH] always run the latency profiler
---
server/djrandom/frontend/frontend.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/server/djrandom/frontend/frontend.py b/server/djrandom/frontend/frontend.py
index 55f0331..8eaba9d 100644
--- a/server/djrandom/frontend/frontend.py
+++ b/server/djrandom/frontend/frontend.py
@@ -13,6 +13,7 @@ from djrandom.frontend.mailer import Mailer
from djrandom.frontend.search import Searcher
from djrandom.model.markov import MarkovModel
from djrandom.model.external import AlbumImageRetriever
+from djrandom.frontend.latency import LatencyProfilerMiddleware
from werkzeug.contrib.cache import SimpleCache, MemcachedCache
from gevent.wsgi import WSGIServer
@@ -37,15 +38,15 @@ def run_frontend(opts):
log.error('Could not read Markov data from %s: %s' % (
opts.markov_data, str(e)))
- # Start the WSGI profiling middleware, if requested.
- if opts.profile:
- from djrandom.frontend.latency import LatencyProfilerMiddleware
- app.wsgi_app = LatencyProfilerMiddleware(
- app.wsgi_app,
- ['/json/album', '/json/song', '/album_image',
- '/json/playlist/get', '/json/playlist/by_title',
- '/json/playlist/list', '/user/activate', '/dl'])
+ # Install our own latency profiler middleware.
+ app.wsgi_app = LatencyProfilerMiddleware(
+ app.wsgi_app,
+ ['/json/album', '/json/song', '/album_image',
+ '/json/playlist/get', '/json/playlist/by_title',
+ '/json/playlist/list', '/user/activate', '/dl'])
+ # Start the cProfile profiling middleware, if requested.
+ if opts.profile:
from repoze.profile.profiler import AccumulatingProfileMiddleware
app.wsgi_app = AccumulatingProfileMiddleware(
app.wsgi_app,
--
GitLab