Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 8 insertions, 6 deletions

diff --git a/src/redisload.clj b/src/redisload.clj
index 31a25f0..8796d9e 100644
--- a/src/redisload.clj
+++ b/src/redisload.clj
@@ -9,6 +9,8 @@
 (defn redis-days [n]
   (* 24 60 60))
 
+;;;; Tag counters
+
 (def tag-query "
 SELECT
     u.nick as author,
@@ -65,7 +67,7 @@ WHERE
 (defn transmit-popular []
   (doseq [[nick msgs] @popular-map]
     (let [sorted-msgs (sort #(>= (second %1) (second %2)) msgs)
-          userkey     (str "popular:" nick)]
+          userkey     (redis-popular-key nick)]
       (redis/atomically
        (redis/del key)
        (doseq [[msg-id score] (take (* num-popular-dumps 2)
@@ -75,19 +77,19 @@ WHERE
 
 (defn transmit-favscores []
   (redis/atomically
-   (redis/del "favscores")
+   (redis/del redis-favscores-key)
    (doseq [[nick score] @score-map]
-     (redis/zadd "favscores" score (lower-case nick))))
+     (redis/zadd redis-favscores-key score (lower-case nick))))
   (println "cached favscores for " (count @score-map) "users"))
 
 (defn transmit-hall []
   (let [scores (take (* 2 num-hall-dumps)
                      (sort #(>= (second %1) (second %2)) @hall-map))]
     (redis/atomically
-     (redis/del "hall")
+     (redis/del redis-hall-key)
      (doseq [[msg-id score] scores]
-       (redis/zadd "hall" score msg-id)))))
-     
+       (redis/zadd redis-hall-key score msg-id)))
+    (println "cached hall-of-fame")))
 
 (println "streaming tags")
 (stream-tags [update-popular])