Better handling of db connection

Author: bellkev

project.clj

@@ -20,8 +20,7 @@
             [lein-resource "0.3.1"]
             [lein-httpd "1.0.0"]
             [lein-shell "0.3.0"]
-            [fsrun "0.1.2"]
-            [com.cemerick/austin "0.1.4-SNAPSHOT"]]
+            [fsrun "0.1.2"]]
   :source-paths ["src"]
   :target-path "target/"
   :uberjar-exclusions [#".*\.cljs"]
@@ -38,8 +37,10 @@
                                          ;; From Om jar
                                          :preamble ["react/react.min.js"]
                                          :externs ["react/externs/react.js"]}}}}
-  :ring {:handler dacom.server/app}
-  :profiles {:dev {:source-paths ["utils/src"]
+  :ring {:init dacom.server/init-conn
+         :handler dacom.server/app}
+  :profiles {:dev {:plugins [[com.cemerick/austin "0.1.4-SNAPSHOT"]]
+                   :source-paths ["utils/src"]
                    :repl-options {:init-ns dacom.repl}
                    :resource {:resource-paths ["web-resources/pages"]
                               :target-path "static"
@@ -49,10 +50,13 @@
                                                        {:body "goog.require('dacom.client')"}
                                                        {:body "goog.require('dacom.repl')"}]}}}
              :db {:main dacom.db}
-             :prod {:target-path "dist/server/"
+             :prod {:main dacom.server
+                    :target-path "dist/server/"
                     :resource {:resource-paths ["web-resources/pages"]
                                :target-path "dist/static"
-                               :extra-values {:scripts [{:src "js/main.js"}]}}}}
+                               :extra-values {:scripts [{:src "js/main.js"}]}}}
+             :uberjar {:omit-source true
+                       :aot :all}}
   :aliases {"bower" ["shell" "bower" "install"]
             "less-debug" ["shell" "lessc" "web-resources/stylesheets/style.less" "static/css/style.css"
                           "--include-path=bower_components/bootstrap/less/" "--source-map"]
@@ -62,6 +66,6 @@
             "install-db" ["with-profile" "db" "run"]
             "run-client" ["do" "bower," "cljsbuild" "once," "less-debug," "resource," "httpd" "8000"]
             "run-server" ["ring" "server-headless"]
-            "dist" ["with-profile" "prod" "do" "ring" "uberjar," "cljsbuild" "once" "prod," "less-prod,"
+            "dist" ["with-profile" "prod" "do" "uberjar," "cljsbuild" "once" "prod," "less-prod,"
                     "resource"]}
   :clean-targets [:target-path :compile-path "static" "dist"])

src/dacom/server.clj

@@ -4,16 +4,20 @@
 (ns dacom.server
   (:require [ring.middleware.cors :as cors]
             [ring.middleware.format :refer [wrap-restful-format]]
+            [ring.adapter.jetty :as jetty]
             [compojure.response :as response]
             [datomic.api :as d :refer [db q]]
             [compojure.core :refer [GET defroutes]]
-            [dacom.config :refer [read-config]]))
+            [dacom.config :refer [read-config]])
+  (:gen-class))
 
-(def conn
-  (d/connect (:datomic-uri (read-config))))
+(defonce conn (atom nil))
+
+(defn init-conn []
+  (reset! conn (d/connect (:datomic-uri (read-config)))))
 
 (defn get-datomic-message []
-  (ffirst (q '[:find ?m :where [?e :demo/message ?m]] (db conn))))
+  (ffirst (q '[:find ?m :where [?e :demo/message ?m]] (db @conn))))
 
 (defroutes handler
            (GET "/" [] {:body {:compojure-message (str (get-datomic-message) ", Compojure")}}))
@@ -24,4 +28,10 @@
         :access-control-allow-origin #"http://localhost:8000"
         :access-control-allow-methods ["GET"]
         :access-control-allow-headers ["Content-Type"])
-      (wrap-restful-format :formats [:edn])))
+      (wrap-restful-format :formats [:edn])))
+
+(defn -main [& [port]]
+  (init-conn)
+  (let [port (Integer. (or port (:port (read-config)) (System/getenv "PORT") 3000))]
+    (jetty/run-jetty app {:port port :join? false})
+    (println "Started server on port" port)))