Improved cache info logging and removed an unneeded cache

Author: JoelEager

packet/context_processors.py

@@ -11,7 +11,6 @@
 
 
 # pylint: disable=bare-except
-@lru_cache(maxsize=128)
 def get_csh_name(username):
     try:
         member = ldap_get_member(username)

packet/log_utils.py

@@ -5,7 +5,10 @@
 from functools import wraps
 from datetime import datetime
 
-from packet import context_processors, app
+from packet import app
+from packet.context_processors import get_rit_name
+from packet.ldap import ldap_get_member
+from packet.utils import is_freshman_on_floor
 
 
 def log_time(func):
@@ -26,16 +29,28 @@ def wrapped_function(*args, **kwargs):
     return wrapped_function
 
 
+def _format_cache(func):
+    """
+    :return: The output of func.cache_info() as a compactly formatted string
+    """
+    info = func.cache_info()
+    return "{}[hits={}, misses={}, size={}/{}]".format(func.__name__, info.hits, info.misses, info.currsize, info.maxsize)
+
+
+# Tuple of lru_cache functions to log stats from
+_caches = (get_rit_name, ldap_get_member, is_freshman_on_floor)
+
+
 def log_cache(func):
     """
     Decorator for logging cache info
     """
+
     @wraps(func)
     def wrapped_function(*args, **kwargs):
         result = func(*args, **kwargs)
 
-        app.logger.info("get_csh_name(): {}, get_rit_name(): {}".format(context_processors.get_csh_name.cache_info(),
-                                                                        context_processors.get_rit_name.cache_info()))
+        app.logger.info("Cache stats: " + ", ".join(map(_format_cache, _caches)))
 
         return result
 

packet/utils.py

@@ -22,7 +22,7 @@ def wrapped_function(*args, **kwargs):
             info = {
                 "realm": "intro",
                 "uid": uid,
-                "onfloor": is_on_floor(uid)
+                "onfloor": is_freshman_on_floor(uid)
             }
         else:
             info = {
@@ -37,7 +37,7 @@ def wrapped_function(*args, **kwargs):
 
 
 @lru_cache(maxsize=128)
-def is_on_floor(rit_username):
+def is_freshman_on_floor(rit_username):
     """
     Checks if a freshman is on floor
     """