From 842e78daef40026e5596406c947ffa2ac054686e Mon Sep 17 00:00:00 2001 From: Bart Akeley Date: Sun, 29 Oct 2017 19:45:52 -0500 Subject: [PATCH] more jdbc config fixes --- project.clj | 2 +- src/aretherecookies/db.clj | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index d8560ae..814a1e9 100644 --- a/project.clj +++ b/project.clj @@ -9,7 +9,7 @@ [compojure "1.5.1"] [ring/ring-defaults "0.2.1"] [org.clojure/java.jdbc "0.7.3"] - [org.postgresql/postgresql "42.1.4.jre6"] + [org.postgresql/postgresql "42.1.4"] [com.mchange/c3p0 "0.9.5.2"] [ring-middleware-format "0.7.2"] [org.clojure/data.json "0.2.6"] diff --git a/src/aretherecookies/db.clj b/src/aretherecookies/db.clj index 0979ae2..298b762 100644 --- a/src/aretherecookies/db.clj +++ b/src/aretherecookies/db.clj @@ -5,17 +5,25 @@ [clojure.string :as str]) (:import com.mchange.v2.c3p0.ComboPooledDataSource)) +(def db-spec { + :uri (env :database-jdbc-uri) + :password (env :database-password) + :user (env :database-user) + :name (env :database-name) +}) + (defn pool [spec] (let [cpds (doto (ComboPooledDataSource.) (.setDriverClass "org.postgresql.Driver") - (.setJdbcUrl (str "jdbc:" (env :database-url))) - ; (.setUser (:user spec)) - (.setPassword (env :database-password)) + (.setJdbcUrl (str "jdbc:" (:uri spec))) + (.setUser (:user spec)) + (.setPassword (:password spec)) ;; expire excess connections after 30 minutes of inactivity: (.setMaxIdleTimeExcessConnections (* 30 60)) ;; expire connections after 3 hours of inactivity: (.setMaxIdleTime (* 3 60 60)))] + (println (str "jdbc:" (:url spec))) {:datasource cpds})) (def pooled-db (delay (pool db-spec)))