diff --git a/src/aretherecookies/db.clj b/src/aretherecookies/db.clj index 2f602f5..0979ae2 100644 --- a/src/aretherecookies/db.clj +++ b/src/aretherecookies/db.clj @@ -5,19 +5,13 @@ [clojure.string :as str]) (:import com.mchange.v2.c3p0.ComboPooledDataSource)) -(def db-spec {:dbtype "postgresql" - :db (env :database-name) - :url (env :database-url) - :user (env :database-user) - :password (env :database-password)}) - (defn pool [spec] (let [cpds (doto (ComboPooledDataSource.) - (.setDriverClass (:classname spec)) - (.setJdbcUrl (str (:url db-spec))) + (.setDriverClass "org.postgresql.Driver") + (.setJdbcUrl (str "jdbc:" (env :database-url))) ; (.setUser (:user spec)) - ; (.setPassword (:password spec)) + (.setPassword (env :database-password)) ;; expire excess connections after 30 minutes of inactivity: (.setMaxIdleTimeExcessConnections (* 30 60)) ;; expire connections after 3 hours of inactivity: