diff --git a/r2/example.ini b/r2/example.ini index 033416b76..b56372d1a 100644 --- a/r2/example.ini +++ b/r2/example.ini @@ -14,6 +14,7 @@ log_path = memcaches = 127.0.0.1:11211 permacaches = 127.0.0.1:11211 +rendercaches = 127.0.0.1:11211 rec_cache = 127.0.0.1:11311 tracker_url = adtracker_url = diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 759c92c96..1d2b22e88 100644 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -57,6 +57,7 @@ class Globals(object): tuple_props = ['memcaches', 'rec_cache', 'permacaches', + 'rendercaches', 'admins', 'sponsors', 'monitored_servers', @@ -112,6 +113,7 @@ class Globals(object): mc = Memcache(self.memcaches) self.cache = CacheChain((LocalCache(), mc)) self.permacache = Memcache(self.permacaches) + self.rendercache = Memcache(self.rendercaches) self.make_lock = make_lock_factory(mc) self.rec_cache = Memcache(self.rec_cache) diff --git a/r2/r2/models/listing.py b/r2/r2/models/listing.py index 7ce806eaa..e80d57d84 100644 --- a/r2/r2/models/listing.py +++ b/r2/r2/models/listing.py @@ -72,7 +72,7 @@ class Listing(object): r[i] = item.render() return r - rendered_items = sgm(cache, fullnames, render_items, 'render_', + rendered_items = sgm(g.rendercache, fullnames, render_items, 'render_', time = g.page_cache_time) #replace the render function