Fixes #229 suppress debug log at shutdown

pull/323/head
Brett Wooldridge 10 years ago
parent 641b90350e
commit d4e426ba48

@ -262,7 +262,7 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
connectionBag.close();
softEvictConnections();
houseKeepingExecutorService.shutdown();
addConnectionExecutor.shutdown();
addConnectionExecutor.shutdownNow();
houseKeepingExecutorService.awaitTermination(5L, TimeUnit.SECONDS);
addConnectionExecutor.awaitTermination(5L, TimeUnit.SECONDS);
@ -456,11 +456,13 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
}
catch (Exception e) {
lastConnectionFailure.set(e);
if (poolState == POOL_RUNNING) {
LOGGER.debug("Connection attempt to database {} failed: {}", configuration.getPoolName(), e.getMessage(), e);
}
poolUtils.quietlyCloseConnection(connection);
LOGGER.debug("Connection attempt to database {} failed: {}", configuration.getPoolName(), e.getMessage(), e);
}
}
totalConnections.decrementAndGet(); // We failed or pool is max, so undo speculative increment of totalConnections
return false;
}

@ -238,6 +238,28 @@ public class ShutdownTest
}
}
@Test
public void testShutdownDuringInit() throws Exception
{
final HikariConfig config = new HikariConfig();
config.setMinimumIdle(5);
config.setMaximumPoolSize(5);
config.setConnectionTimeout(1000);
config.setValidationTimeout(1000);
config.setInitializationFailFast(true);
config.setConnectionTestQuery("VALUES 1");
config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
HikariDataSource ds = new HikariDataSource(config);
try {
StubConnection.slowCreate = true;
UtilityElf.quietlySleep(3000L);
}
finally {
ds.close();
}
}
@Test
public void testThreadedShutdown() throws Exception
{
@ -245,6 +267,7 @@ public class ShutdownTest
config.setMinimumIdle(5);
config.setMaximumPoolSize(5);
config.setConnectionTimeout(1000);
config.setValidationTimeout(1000);
config.setInitializationFailFast(true);
config.setConnectionTestQuery("VALUES 1");
config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");

Loading…
Cancel
Save