Merge branch 'develop'

This commit is contained in:
Teemu Patja 2017-03-06 12:56:01 +02:00
commit 317247e31a
No known key found for this signature in database
GPG Key ID: F5B7035E6580FD4C
3 changed files with 11 additions and 7 deletions

View File

@ -15,7 +15,7 @@
[["-p" "--port PORT" "Port number"
:parse-fn #(Integer/parseInt %)]])
(mount/defstate ^{:on-reload :noop}
(mount/defstate
http-server
:start
(http/start

View File

@ -26,7 +26,9 @@
:migration-table-name "schema_migrations"
:db db}]
(migratus/migrate migratus-config)
(conman/connect! {:jdbc-url db})))
(conman/bind-connection db "sql/queries.sql")
(conman/connect! {:jdbc-url db})
db))
(defstate ^:dynamic *db*
:start (start)

View File

@ -13,6 +13,7 @@
[commiteth.github.core :as github]
[clojure.tools.logging :as log]
[commiteth.eth.core :as eth]
[commiteth.config :refer [env]]
[crypto.random :as random]
[clojure.set :refer [rename-keys]]
[clojure.string :as str]))
@ -141,11 +142,12 @@
(defapi service-routes
(when (:dev env)
{:swagger {:ui "/swagger-ui"
:spec "/swagger.json"
:data {:info {:version "0.1"
:title "commitETH API"
:description "commitETH API"}}}}
:description "commitETH API"}}}})
(context "/api" []
(GET "/top-hunters" []