rising: Use g.gencache

reddit-archive · Jun 20, 2016 · 18fb269 · 18fb269
1 parent 7530395
commit 18fb269
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/install/setup_mcrouter.sh b/install/setup_mcrouter.sh
@@ -77,6 +77,7 @@ if [ ! -f /etc/mcrouter/global.conf ]; then
       "geoip:": "local-pool",
       "geopromo:": "local-pool",
       "srpromos:": "local-pool",
+      "rising:": "local-pool",
     },
     "wildcard": {
       "type": "PoolRoute",

diff --git a/r2/r2/lib/rising.py b/r2/r2/lib/rising.py
@@ -30,9 +30,6 @@
 from r2.models.link import Link
 
 
-CACHE_KEY = "rising"
-
-
 def calc_rising():
     link_counts = count.get_link_counts()
 
@@ -53,11 +50,12 @@ def score(link):
 
 
 def set_rising():
-    g.cache.set(CACHE_KEY, calc_rising())
+    # TODO: spread this around to several keys
+    g.gencache.set("rising:all", calc_rising())
 
 
 def get_all_rising():
-    return g.cache.get(CACHE_KEY, [])
+    return g.gencache.get("rising:all", [])
 
 
 def get_rising(sr):
@@ -88,8 +86,13 @@ def normalized_rising(sr_ids):
     if not sr_ids:
         return []
 
-    tuples_by_srid = sgm(g.cache, sr_ids, miss_fn=get_rising_tuples,
-                         prefix='normalized_rising', time=g.page_cache_time)
+    tuples_by_srid = sgm(
+        cache=g.gencache,
+        keys=sr_ids,
+        miss_fn=get_rising_tuples,
+        prefix='rising:',
+        time=g.page_cache_time,
+    )
 
     merged = heapq.merge(*tuples_by_srid.values())