public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing middleware for new format.

Browse source
This commit is contained in:
Samuel Clay 2020-06-30 19:46:32 -04:00
parent a1447df283
commit 1fc063ff80
5 changed files with 69 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
apps/profile/middleware.py
View file

@ -41,7 +41,13 @@ class LastSeenMiddleware(object):
return response
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response
@ -51,6 +57,7 @@ class DBProfilerMiddleware:
def process_request(self, request):
setattr(request, 'activated_segments', [])
print(" ---> Setting activated_segments", request.activated_segments)
if ((request.path.startswith('/reader/feed') or
request.path.startswith('/reader/river')) and
random.random() < .01):
@ -106,7 +113,13 @@ class DBProfilerMiddleware:
pipe.execute()
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response
@ -158,7 +171,13 @@ class SQLLogToConsoleMiddleware:
self.process_response(profiler, None)
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response
@ -278,7 +297,13 @@ class SimpsonsMiddleware:
return response
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response
@ -293,7 +318,13 @@ class ServerHostnameMiddleware:
return response
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response
@ -306,7 +337,8 @@ class TimingMiddleware:
setattr(request, 'start_time', time.time())
def __call__(self, request):
self.process_request(request)
response = self.process_request(request)
if not response:
response = self.get_response(request)
return response
@ -351,8 +383,13 @@ class UserAgentBanMiddleware:
return HttpResponse(json.encode(data), status=403, mimetype='text/json')
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response

2
newsblur/settings.py
View file

@ -747,7 +747,7 @@ JAMMIT = jammit.JammitAssets(ROOT_DIR)
if DEBUG:
MIDDLEWARE += ('utils.request_introspection_middleware.DumpRequestMiddleware',)
MIDDLEWARE += ('utils.exception_middleware.ConsoleExceptionMiddleware',)
# MIDDLEWARE += ('utils.exception_middleware.ConsoleExceptionMiddleware',)
# =======
# = AWS =

1
utils/mongo_raw_log_middleware.py
View file

@ -80,6 +80,7 @@ class MongoDumpMiddleware(object):
def __call__(self, request):
response = self.get_response(request)
response = self.process_response(request, response)
return response

10
utils/redis_raw_log_middleware.py
View file

@ -13,6 +13,7 @@ class RedisDumpMiddleware(object):
return (settings.DEBUG_QUERIES or
(hasattr(request, 'activated_segments') and
'db_profiler' in request.activated_segments))
def process_view(self, request, callback, callback_args, callback_kwargs):
if not self.activated(request): return
if not getattr(Connection, '_logging', False):
@ -20,6 +21,7 @@ class RedisDumpMiddleware(object):
setattr(Connection, '_logging', True)
Connection.pack_command = \
self._instrument(Connection.pack_command)
def process_celery(self, profiler):
if not self.activated(profiler): return
if not getattr(Connection, '_logging', False):
@ -27,6 +29,7 @@ class RedisDumpMiddleware(object):
setattr(Connection, '_logging', True)
Connection.pack_command = \
self._instrument(Connection.pack_command)
def process_response(self, request, response):
# if settings.DEBUG and hasattr(self, 'orig_pack_command'):
# # remove instrumentation from redis
@ -34,6 +37,7 @@ class RedisDumpMiddleware(object):
# Connection.pack_command = \
# self.orig_pack_command
return response
def _instrument(self, original_method):
def instrumented_method(*args, **kwargs):
message = self.process_message(*args, **kwargs)
@ -63,6 +67,12 @@ class RedisDumpMiddleware(object):
return { 'query': ' '.join(query) }
def __call__(self, request):
response = None
if hasattr(self, 'process_request'):
response = self.process_request(request)
if not response:
response = self.get_response(request)
if hasattr(self, 'process_response'):
response = self.process_response(request, response)
return response

2
utils/request_introspection_middleware.py
View file

@ -13,6 +13,8 @@ class DumpRequestMiddleware:
self.get_response = get_response
def __call__(self, request):
self.process_request(request)
response = self.get_response(request)
return response