Details
diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/listeners/CleanupListener.java b/profiles/killbill/src/main/java/org/killbill/billing/server/listeners/CleanupListener.java
new file mode 100644
index 0000000..c0079d4
--- /dev/null
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/listeners/CleanupListener.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Groupon, Inc
+ * Copyright 2014 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.billing.server.listeners;
+
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Enumeration;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.mysql.jdbc.AbandonedConnectionCleanupThread;
+
+public class CleanupListener implements ServletContextListener {
+
+ private static final Logger logger = LoggerFactory.getLogger(CleanupListener.class);
+
+ @Override
+ public void contextInitialized(final ServletContextEvent servletContextEvent) {
+ }
+
+ @Override
+ public void contextDestroyed(final ServletContextEvent servletContextEvent) {
+ final Enumeration<Driver> drivers = DriverManager.getDrivers();
+ while (drivers.hasMoreElements()) {
+ try {
+ final Driver driver = drivers.nextElement();
+ DriverManager.deregisterDriver(driver);
+ } catch (final SQLException e) {
+ logger.warn("Unable to de-register driver", e);
+ }
+ }
+
+ // See http://docs.oracle.com/cd/E17952_01/connector-j-relnotes-en/news-5-1-23.html
+ try {
+ AbandonedConnectionCleanupThread.shutdown();
+ } catch (final InterruptedException e) {
+ logger.warn("Unable to shutdown MySQL threads", e);
+ }
+ }
+}
diff --git a/profiles/killbill/src/main/webapp/WEB-INF/web.xml b/profiles/killbill/src/main/webapp/WEB-INF/web.xml
index d8dbd95..c101cb0 100644
--- a/profiles/killbill/src/main/webapp/WEB-INF/web.xml
+++ b/profiles/killbill/src/main/webapp/WEB-INF/web.xml
@@ -51,6 +51,10 @@
<!-- Context listener: called at startup time and creates the injector -->
<listener-class>org.killbill.billing.server.listeners.KillbillGuiceListener</listener-class>
</listener>
+ <listener>
+ <!-- Context listener: called at shutdown time and performs cleanup tasks -->
+ <listener-class>org.killbill.billing.server.listeners.CleanupListener</listener-class>
+ </listener>
<!-- ServletHandler#handle requires a backend servlet. Besides, this will also be used to serve static resources,
such as the favicon or the welcome page -->
diff --git a/profiles/killpay/src/main/webapp/WEB-INF/web.xml b/profiles/killpay/src/main/webapp/WEB-INF/web.xml
index 4ddf479..6090924 100644
--- a/profiles/killpay/src/main/webapp/WEB-INF/web.xml
+++ b/profiles/killpay/src/main/webapp/WEB-INF/web.xml
@@ -52,6 +52,10 @@
<!-- Context listener: called at startup time and creates the injector -->
<listener-class>org.killbill.billing.server.listeners.KillpayGuiceListener</listener-class>
</listener>
+ <listener>
+ <!-- Context listener: called at shutdown time and performs cleanup tasks -->
+ <listener-class>org.killbill.billing.server.listeners.CleanupListener</listener-class>
+ </listener>
<!-- ServletHandler#handle requires a backend servlet. Besides, this will also be used to serve static resources,
such as the favicon or the welcome page -->
