Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-16 23:16:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

AMQ-4003: Add option to PooledConnectionFactory to control if connection should be created on startup or not

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378853 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Claus Ibsen 2012-08-30 08:37:44 +00:00
parent 324ab99afa
commit 8fc47c6abf
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-pool/src/main/java/org/apache/activemq/pool/ConnectionPool.java
View File

@ -224,4 +224,9 @@ public class ConnectionPool {
void onSessionInvalidated(PooledSession session) {
this.loanedSessions.remove(session);
}
@Override
public String toString() {
return "ConnectionPool[" + connection + "]";
}
}

52
activemq-pool/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java
View File

@ -61,14 +61,15 @@ import org.apache.commons.pool.impl.GenericObjectPoolFactory;
public class PooledConnectionFactory implements ConnectionFactory, Service {
private static final transient Logger LOG = LoggerFactory.getLogger(PooledConnectionFactory.class);
private ConnectionFactory connectionFactory;
private Map<ConnectionKey, LinkedList<ConnectionPool>> cache = new HashMap<ConnectionKey, LinkedList<ConnectionPool>>();
private final Map<ConnectionKey, LinkedList<ConnectionPool>> cache = new HashMap<ConnectionKey, LinkedList<ConnectionPool>>();
private ObjectPoolFactory poolFactory;
private int maximumActive = 500;
private int maxConnections = 1;
private int idleTimeout = 30 * 1000;
private boolean blockIfSessionPoolIsFull = true;
private AtomicBoolean stopped = new AtomicBoolean(false);
private final AtomicBoolean stopped = new AtomicBoolean(false);
private long expiryTimeout = 0l;
private boolean createConnectionOnStartup = true;
public PooledConnectionFactory() {
this(new ActiveMQConnectionFactory());
@ -116,12 +117,19 @@ public class PooledConnectionFactory implements ConnectionFactory, Service {
// Now.. we might get a connection, but it might be that we need to
// dump it..
if (connection != null && connection.expiredCheck()) {
if (LOG.isTraceEnabled()) {
LOG.trace("Connection has expired: {}", connection);
}
connection = null;
}
if (connection == null) {
ActiveMQConnection delegate = createConnection(key);
connection = createConnectionPool(delegate);
if (LOG.isTraceEnabled()) {
LOG.trace("Created new connection: {}", connection);
}
}
pools.add(connection);
return new PooledConnection(connection);
@ -142,28 +150,28 @@ public class PooledConnectionFactory implements ConnectionFactory, Service {
}
}
/**
* @see org.apache.activemq.service.Service#start()
*/
public void start() {
try {
stopped.set(false);
createConnection();
} catch (JMSException e) {
LOG.warn("Create pooled connection during start failed.", e);
IOExceptionSupport.create(e);
LOG.debug("Staring the PooledConnectionFactory");
stopped.set(false);
if (isCreateConnectionOnStartup()) {
try {
// warm the pool by creating a connection during startup
createConnection();
} catch (JMSException e) {
LOG.warn("Create pooled connection during start failed. This exception will be ignored.", e);
}
}
}
public void stop() {
LOG.debug("Stop the PooledConnectionFactory, number of connections in cache: "+cache.size());
LOG.debug("Stopping the PooledConnectionFactory, number of connections in cache: {}", cache.size());
stopped.set(true);
for (Iterator<LinkedList<ConnectionPool>> iter = cache.values().iterator(); iter.hasNext();) {
for (ConnectionPool connection : iter.next()) {
try {
connection.close();
}catch(Exception e) {
LOG.warn("Close connection failed",e);
} catch (Exception e) {
LOG.warn("Close connection failed for connection: " + connection + ". This exception will be ignored.",e);
}
}
}
@ -264,4 +272,20 @@ public class PooledConnectionFactory implements ConnectionFactory, Service {
public long getExpiryTimeout() {
return expiryTimeout;
}
public boolean isCreateConnectionOnStartup() {
return createConnectionOnStartup;
}
/**
* Whether to create a connection on starting this {@link PooledConnectionFactory}.
* <p/>
* This can be used to warmup the pool on startup. Notice that any kind of exception
* happens during startup is logged at WARN level and ignored.
*
* @param createConnectionOnStartup <tt>true</tt> to create a connection on startup
*/
public void setCreateConnectionOnStartup(boolean createConnectionOnStartup) {
this.createConnectionOnStartup = createConnectionOnStartup;
}
}