Variable rename

1 files changed, 9 insertions, 8 deletions

diff --git a/src/site.clj b/src/site.clj
index e86825b..8608349 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -20,8 +20,8 @@
         feed))
 
 (def *run-flusher* true)
-(def *flusher-sleep-ms* 4000)
-(def *user-timeout-ms* 15000)
+(def *flusher-sleep* (seconds 4))
+(def *user-timeout* (seconds 15))
 
 (def template-group (new StringTemplateGroup "dumpfm" "template"))
 (.setRefreshInterval template-group 3)
@@ -41,10 +41,10 @@
     (dosync
      (let [users (room :users)
            now (System/currentTimeMillis)
-           alive? (fn [[n u]] (> (u :last-seen) (- now *user-timeout-ms*)))]
+           alive? (fn [[n u]] (> (u :last-seen) (- now *user-timeout*)))]
        (ref-set users
                 (into {} (filter alive? @users))))))
-  (Thread/sleep *flusher-sleep-ms*)
+  (Thread/sleep *flusher-sleep*)
   (when *run-flusher*
     (send *agent* #'flush-inactive-users!))
   x)
@@ -379,7 +379,7 @@
 (def *directory-listing* (ref []))
 (def *per-directory-page* 25)
 (def *run-update-directory* true)
-(def *update-directory-sleep-ms* (* 60 60 1000))
+(def *update-directory-sleep* (minutes 15))
 
 (defn directory-search [offset]
   (let [directory @*directory-listing* 
@@ -394,14 +394,15 @@
                  "AND m.user_id = u.user_id "
                  "AND m.created_on = (select max(created_on) from messages "
                  "                    where user_id = u.user_id)")]
-    (when (> (count user-ids) 0)
+    (if (> (count user-ids) 0)
       (let [res (do-select [qry])
             keys (map :user_id res)           
             dict (zipmap keys res)]
          (map (fn [u]
                 (let [u-id (u :user_id)]
                   (stringify-and-escape (merge u (dict u-id)))))
-              users)))))
+              users))
+      [])))
            
 (defn update-directory! []
   (let [qry (str "SELECT u.user_id, COUNT(m) as cnt "
@@ -415,7 +416,7 @@
 
 (defn update-directory-agent-func [x]
   (update-directory!)
-  (Thread/sleep *update-directory-sleep-ms*)
+  (Thread/sleep *update-directory-sleep*)
   (when *run-update-directory*
     (send *directory-agent* #'update-directory-agent-func))
   x)