Remove init-server from state handling

src/clj/grub/core.clj

@@ -3,6 +3,7 @@
             [grub.db :as db]
             [grub.test.integration.core :as integration-test]
             [grub.state :as state]
+            [grub.sync :as sync]
             [ring.middleware.file :as file]
             [ring.middleware.content-type :as content-type]
             [ring.util.response :as resp]
@@ -40,21 +41,21 @@
 
 (def prod-system
   {:index prod-index-page
-   :db {:name "grub"
-        :db nil
-        :conn nil}
+   :db-name "grub"
+   :db nil
+   :db-conn nil
    :port 3000
    :stop-server nil
-   :states nil})
+   :states (atom nil)})
 
 (def dev-system
   {:index dev-index-page
-   :db {:name "grub-dev"
-        :db nil
-        :conn nil}
+   :db-name "grub-dev"
+   :db nil
+   :db-conn nil
    :port 3000
    :stop-server nil
-   :states nil})
+   :states (atom nil)})
 
 (defn handle-websocket [handler states]
   (fn [{:keys [websocket?] :as request}]
@@ -79,20 +80,26 @@
       (handle-root index)
       (handle-websocket states)))
 
-(defn start [current {:keys [port db] :as system}]
+(defn start [current {:keys [port db-name states] :as system}]
   (let [to-db (chan)
-        db (db/connect-and-handle-events to-db (:name db))
-        states (state/init-server to-db (db/get-current-state (:db db)))
+        {:keys [db conn]} (db/connect db-name)
+        _ (reset! states (sync/new-state (db/get-current-state db)))
         stop-server (httpkit/run-server (make-handler system states) {:port port})]
+    (add-watch states :db (fn [_ _ old-states new-states] 
+                            (db/update-db! db (sync/get-current-state new-states))))
     (println "Started server on localhost:" port)
     (assoc system 
-      :db (merge (:db system) db)
+      :db db
+      :db-conn conn
       :stop-server stop-server
       :states states)))
 
-(defn stop [{:keys [db stop-server] :as system}]
+
+(defn stop [{:keys [db stop-server states] :as system}]
+  (remove-watch states :db)
   (stop-server)
   (db/disconnect (:conn db))
+  (reset! states nil)
   system)
 
 (defn usage [options-summary]

src/clj/grub/db.clj

@@ -21,15 +21,10 @@
       (dissoc state :_id)
       sync/empty-state)))
 
-(defn connect-and-handle-events [to-db db-name]
-  (println "Connected to mongo at localhost:" db-name)
+(defn connect [db-name]
   (let [conn (m/connect)
         db (m/get-db conn db-name)]
-    (a/go-loop []
-               (if-let [state (<! to-db)]
-                 (do (update-db! db state)
-                     (recur))
-                 (println "Database disconnected")))
+    (println "Connected to mongo at localhost:" db-name)
     {:conn conn
      :db db}))
 

src/cljx/grub/state.cljx

@@ -82,13 +82,6 @@
                        (a/close! state-change-events)))))
     (make-server-agent client-events >client states sync/empty-state)))
 
-#+clj
-(defn init-server [to-db initial-state]
-  (let [states (atom (sync/new-state initial-state))]
-    (add-watch states :to-db (fn [_ _ old-states new-states] 
-                               (a/put! to-db (sync/get-current-state new-states))))
-    states))
-
 #+cljs
 (defn init-client [<remote >remote <view >view]
   (let [states (atom (sync/initial-state {} {}))