summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2010-06-16 01:42:00 -0400
committerScott Ostler <scottbot9000@gmail.com>2010-06-16 01:42:00 -0400
commit574b8b6b6c78729dddda2f7d98eb3ea9e200aa4e (patch)
treeef7cd8f55139c01f8d0ac7b205b2b61021092d89
parentd154eefc35ce4001aa6d1a6c11e9261228dd0cdc (diff)
Fix browser, enable nio sockets, enable feeds
-rw-r--r--src/site.clj14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/site.clj b/src/site.clj
index f6291df..e8f2b1e 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -626,7 +626,7 @@ FROM users u
(if nick
(dosync
(login-user (user-struct-from-session session) room)))
- (let [user-list (prepare-user-list room)]
+ (let [user-list (prepare-user-list room false)]
(.setAttribute st "users" user-list))
(.setAttribute st "roomkey" (room :key))
(.setAttribute st "isadminroom" (room :admin_only))
@@ -1089,7 +1089,8 @@ FROM users u
;;; Startup Code
(defn start-server [port]
- (run-server {:port port}
+ (run-server {:port port
+ :nio true}
"/static/*" (servlet static)
"/images/*" (servlet static)
"/avatars/*" (servlet static)
@@ -1107,14 +1108,15 @@ FROM users u
(load-rooms!)
(start! reserved-nicks)
-(start-server (options :port))
+(def server (start-server (options :port)))
(start! *user-scores*)
(start! *user-info*)
(start! *active-mutes*)
-(Thread/sleep 3000) ; Delay these to reduce start-load
+
+; Delay the following to reduce start-load
+(Thread/sleep 3000)
(start-user-flusher!)
(start-session-pruner!)
-
-;(start! feed-downloader)
+(start! feed-downloader)
(start! feed-inserter)