added proper configuration using aero

src/book/cli/core.clj

@@ -0,0 +1 @@
+(ns book.cli.core)

src/book/cli/exchange.clj

@@ -1,4 +1,4 @@
-(ns book.cli
+(ns book.cli.exchange
   (:require [book.match :refer [sell?]]
     [book.util :refer :all]
     [book.exchange :refer [empty-book create-exchange-for-security]]

src/book/core.clj

@@ -1,10 +1,15 @@
 (ns book.core
-  (:require [book.cli]
-            [book.web])
+  (:require [book.cli.core]
+            [book.rest.core]
+            [aero.core :refer (read-config)])
   (:gen-class))
 
+(def apps {:webserver book.rest.core/-main})
+
 (defn -main [& argv]
-  (case (first argv)
-    "web" (apply book.web/-main (rest argv))
-    "cli" (apply book.cli/-main (rest argv))
-    (println "First argument must be web or cli")))
+  (let [config (-> "config.edn" clojure.java.io/resource read-config)
+        target (-> argv first keyword)
+        target-fn (get apps target)]
+    (if target-fn
+      (apply target-fn [config])
+      (println "target" target "not found"))))

src/book/rest/core.clj

@@ -0,0 +1,11 @@
+(ns book.rest.core
+  (:require [org.httpkit.server :refer [run-server]]
+            [compojure.handler :refer [api]]
+            [book.rest.exchange :refer [create-exchanges-api-for
+                                        create-routes]]))
+
+(defn -main [config]
+  (let [webserver-config (:webserver config)
+        exchange-apis (create-exchanges-api-for (:securities config))
+        api-routes (create-routes exchange-apis)]
+    (run-server (api api-routes) webserver-config)))

src/book/rest/exchange.clj

@@ -1,4 +1,4 @@
-(ns book.web
+(ns book.rest.exchange
   (:require [book.exchange :refer [empty-book]]
             [org.httpkit.server :refer [run-server with-channel send! close on-close]]
             [compojure.route :refer [not-found]]
@@ -39,6 +39,10 @@
      :trades-publisher         trades-publisher
      :new-book-order-publisher new-book-order-publisher}))
 
+(defn create-exchanges-api-for [security-definitions]
+  (let [f (fn [sec] [(:sec-id sec) (create-exchange-api-for (:sec-id sec))])]
+    (into {} (map f security-definitions))))
+
 
 (defn get-new-order-channel [exchange-apis sec-id]
   (let [exchange (get exchange-apis sec-id)
@@ -135,9 +139,3 @@
       (GET "/securities/:sec-id/trades" [] (listen-to-trades exchange-apis))
       (GET "/securities/:sec-id/orders" [] (listen-to-orders exchange-apis)))
     (not-found "not found")))
-
-
-(defn -main [& args]
-  (let [exchange-apis {:foo (create-exchange-api-for :foo) :bar (create-exchange-api-for :bar)}
-        api-routes (create-routes exchange-apis)]
-    (run-server (api api-routes) {:port 8080})))

src/book/rest/marketdata.clj

@@ -0,0 +1 @@
+(ns book.rest.marketdata)