Commit 052492db by cahrens

Add GUID to memory middleware logs.

parent 8df5c941
...@@ -19,6 +19,7 @@ except ImportError: ...@@ -19,6 +19,7 @@ except ImportError:
import psutil import psutil
import request_cache import request_cache
from uuid import uuid4
from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace
...@@ -83,9 +84,11 @@ class MonitoringMemoryMiddleware(object): ...@@ -83,9 +84,11 @@ class MonitoringMemoryMiddleware(object):
Middleware for monitoring memory usage. Middleware for monitoring memory usage.
""" """
memory_data_key = u'memory_data' memory_data_key = u'memory_data'
guid_key = u'guid_key'
def process_request(self, request): def process_request(self, request):
if self._is_enabled(): if self._is_enabled():
self._cache[self.guid_key] = unicode(uuid4())
log_prefix = self._log_prefix(u"Before", request) log_prefix = self._log_prefix(u"Before", request)
self._cache[self.memory_data_key] = self._memory_data(log_prefix) self._cache[self.memory_data_key] = self._memory_data(log_prefix)
...@@ -109,7 +112,7 @@ class MonitoringMemoryMiddleware(object): ...@@ -109,7 +112,7 @@ class MonitoringMemoryMiddleware(object):
""" """
Returns a formatted prefix for logging for the given request. Returns a formatted prefix for logging for the given request.
""" """
return u"{} request '{} {}'".format(prefix, request.method, request.path) return u"{} request '{} {} {}'".format(prefix, request.method, request.path, self._cache[self.guid_key])
def _memory_data(self, log_prefix): def _memory_data(self, log_prefix):
""" """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment