summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2012-07-01 16:28:33 +0200
committerMatthias Andreas Benkard <code@mail.matthias.benkard.de>2012-07-01 16:35:32 +0200
commit3f618aa9851fd7ca4a8c4f00c06f35527f39cd99 (patch)
tree81e0a414a75e539657613bd513b2731612265818
parent81a34ce78c8080c95274384204049894806d3d79 (diff)
Fix swap!/reset! confusion.
-rw-r--r--src/mulk/benki/main.clj6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mulk/benki/main.clj b/src/mulk/benki/main.clj
index 6908561..35f6e03 100644
--- a/src/mulk/benki/main.clj
+++ b/src/mulk/benki/main.clj
@@ -114,7 +114,7 @@
response))))
(defn init-config! []
- (swap! benki-config (read-string (slurp (.getFile (clojure.java.io/resource "config.sexp"))))))
+ (reset! benki-config (read-string (slurp (.getFile (clojure.java.io/resource "config.sexp"))))))
(defn init-middleware! []
(noir.server/add-middleware #(ring.middleware.file-info/wrap-file-info %))
@@ -136,7 +136,7 @@
{:port (:web-port @benki-config)
:websocket true})))
-(def server (atom nil))
+(defonce server (atom nil))
(defn init-security! []
(java.security.Security/addProvider
@@ -153,7 +153,7 @@
((ns-resolve 'mulk.benki.xmpp 'init-xmpp!)))
(future (require 'mulk.benki.lazychat)
((ns-resolve 'mulk.benki.lazychat 'init-lazychat!)))
- (future (swap! server (run-server))))
+ (future (reset! server (run-server))))
(loop []
(Thread/sleep 1000000)
(recur)))