From 109e9c3d3eb44495ac5548e8efe011f72d1d8990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cam=20Sa=C3=BCl?= <cammsaul@gmail.com>
Date: Wed, 29 Jun 2016 20:53:00 -0700
Subject: [PATCH] Minor cleanup for new korma replacement DB stuff :honey_pot:
---
src/metabase/db.clj | 50 ++++++++++++---------------------------------
1 file changed, 13 insertions(+), 37 deletions(-)
diff --git a/src/metabase/db.clj b/src/metabase/db.clj
index 62df75446ef..e00bce0eb4c 100644
--- a/src/metabase/db.clj
+++ b/src/metabase/db.clj
@@ -137,50 +137,26 @@
(defn connection-pool
"Create a C3P0 connection pool for the given database SPEC."
- [{:keys [subprotocol
- subname
- classname
- excess-timeout
- idle-timeout
- initial-pool-size
- minimum-pool-size
- maximum-pool-size
- test-connection-query
- idle-connection-test-period
- test-connection-on-checkin
- test-connection-on-checkout]
- :or {excess-timeout (* 30 60)
- idle-timeout (* 3 60 60)
- initial-pool-size 3
- minimum-pool-size 3
- maximum-pool-size 15
- test-connection-query nil
- idle-connection-test-period 0
- test-connection-on-checkin false
- test-connection-on-checkout false}
- :as spec}]
+ [{:keys [subprotocol subname classname minimum-pool-size idle-connection-test-period excess-timeout]
+ :or {minimum-pool-size 3
+ idle-connection-test-period 0
+ excess-timeout (* 30 60)}
+ :as spec}]
{:datasource (doto (ComboPooledDataSource.)
(.setDriverClass classname)
(.setJdbcUrl (str "jdbc:" subprotocol ":" subname))
(.setMaxIdleTimeExcessConnections excess-timeout)
- (.setMaxIdleTime idle-timeout)
- (.setInitialPoolSize initial-pool-size)
+ (.setMaxIdleTime (* 3 60 60))
+ (.setInitialPoolSize 3)
(.setMinPoolSize minimum-pool-size)
- (.setMaxPoolSize maximum-pool-size)
+ (.setMaxPoolSize 15)
(.setIdleConnectionTestPeriod idle-connection-test-period)
- (.setTestConnectionOnCheckin test-connection-on-checkin)
- (.setTestConnectionOnCheckout test-connection-on-checkout)
- (.setPreferredTestQuery test-connection-query)
+ (.setTestConnectionOnCheckin false)
+ (.setTestConnectionOnCheckout false)
+ (.setPreferredTestQuery nil)
(.setProperties (u/prog1 (java.util.Properties.)
- (doseq [[k v] (dissoc spec
- :make-pool? :classname :subprotocol :subname
- :naming :delimiters :alias-delimiter
- :excess-timeout :idle-timeout
- :initial-pool-size :minimum-pool-size :maximum-pool-size
- :test-connection-query
- :idle-connection-test-period
- :test-connection-on-checkin
- :test-connection-on-checkout)]
+ (doseq [[k v] (dissoc spec :make-pool? :classname :subprotocol :subname :naming :delimiters :alias-delimiter
+ :excess-timeout :minimum-pool-size :idle-connection-test-period)]
(.setProperty <> (name k) (str v))))))})
(def ^:private db-connection-pool
--
GitLab