From 81a34ce78c8080c95274384204049894806d3d79 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sun, 1 Jul 2012 16:04:04 +0200 Subject: Move configuration file loading from load-time to run-time. --- src/mulk/benki/main.clj | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/mulk/benki/main.clj') diff --git a/src/mulk/benki/main.clj b/src/mulk/benki/main.clj index 0c2f20f..6908561 100644 --- a/src/mulk/benki/main.clj +++ b/src/mulk/benki/main.clj @@ -113,7 +113,10 @@ (assoc-in response [:headers "Content-Type"] exttype) response)))) -(do-once ::init +(defn init-config! [] + (swap! 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 %)) (noir.server/add-middleware #(hiccup.middleware/wrap-base-url % (:base-uri @benki-config))) (noir.server/add-middleware #(wrap-missing-status-code %)) @@ -142,6 +145,8 @@ (defn -main [& args] (do + (init-config!) + (init-middleware!) (noir.server/load-views-ns 'mulk.benki) (init-security!) (future (require 'mulk.benki.xmpp) -- cgit v1.2.3