193 start-end pairs added

This commit is contained in:
Ivan Grishaev 2017-12-26 19:21:08 +03:00
parent 58de6ae3c6
commit 0eba6fed2e
3 changed files with 27 additions and 10 deletions

View File

@ -1,10 +1,16 @@
(ns commiteth.config
(:require [cprop.core :refer [load-config]]
[cprop.source :as source]
[mount.core :refer [args defstate]]))
[mount.core :refer [args defstate] :as mount]))
(defstate env :start (load-config
:merge
[(args)
(source/from-system-props)
(source/from-env)]))
(defn start! []
(mount/start #'env))
(defn stop! []
(mount/stop #'env))

View File

@ -16,17 +16,23 @@
:parse-fn #(Integer/parseInt %)]])
(mount/defstate
http-server
http-server
:start
(http/start
(-> env
(assoc :handler (handler/app))
(update :port #(or (-> env :options :port) %))))
(-> env
(assoc :handler (handler/app))
(update :port #(or (-> env :options :port) %))))
:stop
(http/stop http-server))
(defn start! []
(mount/start #'http-server))
(defn stop! []
(mount/stop #'http-server))
(mount/defstate ^{:on-reload :noop}
repl-server
repl-server
:start
(when-let [nrepl-port (env :nrepl-port)]
(log/info "Starting NREPL server on port" nrepl-port)

View File

@ -4,7 +4,7 @@
[clojure.java.jdbc :as jdbc]
[conman.core :as conman]
[commiteth.config :refer [env]]
[mount.core :refer [defstate]]
[mount.core :refer [defstate] :as mount]
[migratus.core :as migratus]
[mpg.core :as mpg]
[clojure.string :as str])
@ -20,21 +20,26 @@
(mpg/patch)
(defn start []
(defn db-start []
(let [db (env :jdbc-database-url)
migratus-config {:store :database
:migration-dir "migrations/"
:migration-table-name "schema_migrations"
:db db}]
(migratus/migrate migratus-config)
(conman/bind-connection db "sql/queries.sql")
(conman/connect! {:jdbc-url db})
db))
(defstate ^:dynamic *db*
:start (start)
:start (db-start)
:stop (conman/disconnect! *db*))
(defn start! []
(mount/start #'*db*))
(defn stop! []
(mount/stop #'*db*))
(conman/bind-connection *db* "sql/queries.sql")
(defn to-date [^java.sql.Date sql-date]