Merge branch 'master' into rename/reddit-to-tippr

Author: acalcutt

r2/r2/lib/base.py

@@ -179,7 +179,8 @@ def __before__(self):
             c.used_localized_defaults = False
         if not hasattr(c, 'render_tracker'):
             # used by wrapped/templated rendering to track render state
-            c.render_tracker = {}
+            # Must be None (not {}) so that _render() can detect the primary template
+            c.render_tracker = None
 
         self.pre()
 

r2/r2/lib/cache.py

@@ -102,15 +102,7 @@ def get(self, key, default = None):
     def get_multi(self, keys, prefix = ''):
         str_keys = [str(key) for key in keys]
         with self.clients.reserve() as mc:
-            result = mc.get_multi(str_keys, key_prefix=prefix)
-            # Debug logging for cache investigation
-            if str_keys and str_keys[0].startswith('rend:'):
-                try:
-                    g.log.warning("CMemcache.get_multi: %d keys requested, %d hits. Sample key: %s",
-                                  len(str_keys), len(result), str_keys[0][:80])
-                except Exception:
-                    pass  # Ignore logging errors during reload
-            return result
+            return mc.get_multi(str_keys, key_prefix=prefix)
 
     # simple_get_multi exists so that a cache chain can
     # single-instance the handling of prefixes for performance, but
@@ -134,15 +126,6 @@ def set_multi(self, keys, prefix='', time=0):
             raise ValueError("Rejecting negative TTL for key %s" % key)
 
         str_keys = {str(k): v for k, v in keys.items()}
-        # Debug logging for cache investigation
-        if str_keys:
-            sample_key = list(str_keys.keys())[0]
-            if sample_key.startswith('rend:'):
-                try:
-                    g.log.warning("CMemcache.set_multi: %d keys, time=%d. Sample key: %s, value type: %s",
-                                  len(str_keys), time, sample_key[:80], type(list(str_keys.values())[0]).__name__)
-                except Exception:
-                    pass  # Ignore logging errors during reload
         with self.clients.reserve() as mc:
             return mc.set_multi(str_keys, key_prefix=prefix, time=time,
                                 min_compress_len=self.min_compress_len)

r2/r2/lib/wrapped.pyx

@@ -243,7 +243,7 @@ class Templated(object):
 
         style = style or c.render_style or 'html'
 
-        # prepare (and store) the list of cachable items. 
+        # prepare (and store) the list of cachable items.
         primary = False
         if not isinstance(c.render_tracker, dict):
             primary = True
@@ -374,19 +374,15 @@ class Templated(object):
             return
 
         try:
-            g.log.debug("rendercache write: %d keys: %s", len(keys), list(keys.keys())[:3])
             g.rendercache.set_multi(keys, time=3600)
         except MemcachedError as e:
-            g.log.warning("rendercache write error: %s", e)
+            g.log.warning("rendercache error: %s", e)
             return
 
     def _read_cache(self, keys):
         from pylons import app_globals as g
 
-        cache_keys = list(keys.keys()) if isinstance(keys, dict) else list(keys)
-        g.log.debug("rendercache read: %d keys: %s", len(cache_keys), cache_keys[:3])
         ret = g.rendercache.get_multi(keys)
-        g.log.debug("rendercache read result: %d hits: %s", len(ret), list(ret.keys())[:3])
         return ret
 
     def render(self, style = None, **kw):

r2/r2/models/wiki.py

@@ -237,10 +237,18 @@ def get_author(self):
 
     @classmethod
     def id_for(cls, sr, name):
-        id = getattr(sr, '_id36', None)
-        if not id:
-            raise tdb_cassandra.NotFound
-        return wiki_id(id, name)
+        # Prefer the canonical _id36 for real subreddits. Some special site
+        # objects (e.g. `Frontpage` / `DefaultSR`) are not real subreddits and
+        # won't have `_id36` set — fall back to using their `name` so global
+        # wiki pages (site-level policies, etc.) can be resolved.
+        id_val = getattr(sr, '_id36', None)
+        if not id_val:
+            name_val = getattr(sr, 'name', None)
+            if not name_val:
+                raise tdb_cassandra.NotFound
+            id_val = name_val.strip()
+
+        return wiki_id(id_val, name)
 
     @classmethod
     def get_multiple(cls, pages):