You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2012/12/06 09:09:10 UTC
[28/100] [abbrv] git commit: Summary: Extract redundant datasource
code into method for Transaction.java
Summary: Extract redundant datasource code into method for Transaction.java
Reviewed-by: Prasanna Santhanam <ts...@apache.org>
Reported-by: Laszlo Hornyak <lh...@redhat.com>
Signed-off-by: Prasanna Santhanam <ts...@apache.org> 1352745925 +0530
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1a67e3f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1a67e3f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1a67e3f5
Branch: refs/heads/events-framework
Commit: 1a67e3f5c64ae55ae022f0bc6640d2bda3511a1f
Parents: 29978bd
Author: Laszlo Hornyak <lh...@redhat.com>
Authored: Tue Nov 13 00:13:06 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Nov 13 00:15:24 2012 +0530
----------------------------------------------------------------------
utils/src/com/cloud/utils/db/Transaction.java | 28 ++++++++++----------
1 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1a67e3f5/utils/src/com/cloud/utils/db/Transaction.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
index 7be9ee3..0fa3e0a 100755
--- a/utils/src/com/cloud/utils/db/Transaction.java
+++ b/utils/src/com/cloud/utils/db/Transaction.java
@@ -1111,21 +1111,21 @@ public class Transaction {
s_logger.debug("Simulator DB properties are not available. Not initializing simulator DS");
}
} catch (final Exception e) {
- final GenericObjectPool connectionPool = new GenericObjectPool(null, 5);
- final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory("jdbc:mysql://localhost:3306/cloud", "cloud", "cloud");
- final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(connectionFactory, connectionPool, null, null, false, true);
- s_ds = new PoolingDataSource(/*connectionPool*/ poolableConnectionFactory.getPool());
-
- final GenericObjectPool connectionPoolUsage = new GenericObjectPool(null, 5);
- final ConnectionFactory connectionFactoryUsage = new DriverManagerConnectionFactory("jdbc:mysql://localhost:3306/cloud_usage", "cloud", "cloud");
- final PoolableConnectionFactory poolableConnectionFactoryUsage = new PoolableConnectionFactory(connectionFactoryUsage, connectionPoolUsage, null, null, false, true);
- s_usageDS = new PoolingDataSource(poolableConnectionFactoryUsage.getPool());
-
- final GenericObjectPool connectionPoolsimulator = new GenericObjectPool(null, 5);
- final ConnectionFactory connectionFactorysimulator = new DriverManagerConnectionFactory("jdbc:mysql://localhost:3306/cloud_simulator", "cloud", "cloud");
- final PoolableConnectionFactory poolableConnectionFactorysimulator = new PoolableConnectionFactory(connectionFactorysimulator, connectionPoolsimulator, null, null, false, true);
- s_simulatorDS = new PoolingDataSource(poolableConnectionFactorysimulator.getPool());
+ s_ds = getDefaultDataSource("cloud");
+ s_usageDS = getDefaultDataSource("cloud_usage");
+ s_simulatorDS = getDefaultDataSource("cloud_simulator");
s_logger.warn("Unable to load db configuration, using defaults with 5 connections. Please check your configuration", e);
}
}
+
+ private static DataSource getDefaultDataSource(final String database) {
+ final GenericObjectPool connectionPool = new GenericObjectPool(null, 5);
+ final ConnectionFactory connectionFactory = new DriverManagerConnectionFactory(
+ "jdbc:mysql://localhost:3306/" + database, "cloud", "cloud");
+ final PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(
+ connectionFactory, connectionPool, null, null, false, true);
+ return new PoolingDataSource(
+ /* connectionPool */poolableConnectionFactory.getPool());
+ }
+
}