Fixed HTTPD setup.

src/clj/timi/server/components/httpd.clj

@@ -8,15 +8,16 @@
   "Make app components available to request handlers."
   [handler cpnt]
   (fn [request]
-    (handler (assoc request :system cpnt))))
+    (handler (assoc request :component cpnt))))
 
-(defrecord HTTPServer [ring-handler]
+(defrecord HTTPServer [app-handler-fn]
   component/Lifecycle
 
   (start [component]
     (log/info "Starting HTTP server ...")
-    (let [http-cfg (get-in component [:cfg-mgr :cfg :httpd])
-          handler (inject-app ring-handler component)
+    (let [app-cfg (get-in component [:cfg-mgr :cfg])
+          http-cfg (:httpd app-cfg)
+          handler (inject-app (app-handler-fn app-cfg) component)
           server (httpkit/run-server handler http-cfg)]
       (log/debug "Using config:" http-cfg)
       (log/debug "Component keys:" (keys component))
@@ -31,5 +32,5 @@
           (server))) ; calling server like this stops it, if started
     (assoc component :httpd nil)))
 
-(defn new-server [ring-handler]
-  (->HTTPServer ring-handler))
+(defn new-server [app-handler-fn]
+  (->HTTPServer app-handler-fn))