status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

JDBC_DATABASE_URL

This commit is contained in:
kagel 2016-08-30 01:57:35 +03:00
parent 520e5e34e4
commit a484d477f4
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env/dev/resources/config.edn vendored
View File

@ -2,7 +2,7 @@
:port 3000 :port 3000
;; when :nrepl-port is set the application starts the nREPL server on load ;; when :nrepl-port is set the application starts the nREPL server on load
:nrepl-port 7000 :nrepl-port 7000
:database-url "jdbc:postgresql://localhost/commiteth?user=commiteth&password=commiteth" :jdbc-database-url "jdbc:postgresql://localhost/commiteth?user=commiteth&password=commiteth"
:server-address "http://localhost:3000" :server-address "http://localhost:3000"
:github-client-id "caf23d90246fa99ca545" :github-client-id "caf23d90246fa99ca545"
:github-client-secret "e8e7a088e7769c77e9e2d87c47ef81df51080bf3"} :github-client-secret "e8e7a088e7769c77e9e2d87c47ef81df51080bf3"}

2
env/prod/resources/config.edn vendored
View File

@ -1,6 +1,6 @@
{:production true {:production true
:port 3000 :port 3000
:database-url "jdbc:postgresql://ec2-54-217-213-203.eu-west-1.compute.amazonaws.com:5432/d7cku33rlq0j96?user=wehpnfptnwmvwn&password=YpJoD1AmgPN4FMyQHl1FO3bWmI" :jdbc-database-url "jdbc:postgresql://ec2-54-217-213-203.eu-west-1.compute.amazonaws.com:5432/d7cku33rlq0j96?user=wehpnfptnwmvwn&password=YpJoD1AmgPN4FMyQHl1FO3bWmI"
:server-address "http://commiteth.herokuapp.com" :server-address "http://commiteth.herokuapp.com"
:github-client-id "eaf23cff7b5fbdf716a6" :github-client-id "eaf23cff7b5fbdf716a6"
:github-client-secret "a31af857986c8385b95962c7a590033513ef24d9"} :github-client-secret "a31af857986c8385b95962c7a590033513ef24d9"}

2
env/test/resources/config.edn vendored
View File

@ -2,7 +2,7 @@
:port 3001 :port 3001
;; when :nrepl-port is set the application starts the nREPL server on load ;; when :nrepl-port is set the application starts the nREPL server on load
:nrepl-port 7001 :nrepl-port 7001
:database-url "jdbc:postgresql://localhost/commiteth?user=commiteth&password=commiteth" :jdbc-database-url "jdbc:postgresql://localhost/commiteth?user=commiteth&password=commiteth"
:server-address "http://localhost:3000" :server-address "http://localhost:3000"
:github-client-id "caf23d90246fa99ca545" :github-client-id "caf23d90246fa99ca545"
:github-client-secret "e8e7a088e7769c77e9e2d87c47ef81df51080bf3"} :github-client-secret "e8e7a088e7769c77e9e2d87c47ef81df51080bf3"}

2
src/clj/commiteth/core.clj
View File

@ -53,7 +53,7 @@ repl-server
(mount/start (mount/start
#'commiteth.config/env #'commiteth.config/env
#'commiteth.db.core/*db*) #'commiteth.db.core/*db*)
(migrations/migrate args (select-keys env [:database-url])) (migrations/migrate args (select-keys env [:jdbc-database-url]))
(System/exit 0)) (System/exit 0))
:else :else
(start-app args))) (start-app args)))

2
src/clj/commiteth/db/core.clj
View File

@ -16,7 +16,7 @@
PreparedStatement])) PreparedStatement]))
(defstate ^:dynamic *db* (defstate ^:dynamic *db*
:start (conman/connect! {:jdbc-url (env :database-url)}) :start (conman/connect! {:jdbc-url (env :jdbc-database-url)})
:stop (conman/disconnect! *db*)) :stop (conman/disconnect! *db*))
(conman/bind-connection *db* "sql/queries.sql") (conman/bind-connection *db* "sql/queries.sql")

2
test/clj/commiteth/test/db/core.clj
View File

@ -12,7 +12,7 @@
(mount/start (mount/start
#'commiteth.config/env #'commiteth.config/env
#'commiteth.db.core/*db*) #'commiteth.db.core/*db*)
(migrations/migrate ["migrate"] (select-keys env [:database-url])) (migrations/migrate ["migrate"] (select-keys env [:jdbc-database-url]))
(f))) (f)))
(deftest test-users (deftest test-users