[JM-343] Migrated to proxool instead of homebrew connection pool handler. ...

[JM-343] Migrated to proxool instead of homebrew connection pool handler.  Also added /proxool to admin console to see statistics from proxool.  At some point we should wrap this in a cute openfire looking page.  No API changes necessary anywhere else in code or 3rd party database connection providers!

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9758 b35dd754-fafc-0310-a699-88a17e54d16e

build/lib/versions.txt

@@ -39,6 +39,7 @@ mysql.jar                           | 5.0.8
 objenesis                           | 1.0 (JMock 2.1.0)
 pack200task.jar                     | August 5, 2004
 postgres.jar                        | 8.2-506.jdbc3
+proxool.jar                         | 0.9.0RC3
 rome.jar                            | 0.9
 rome-fetcher.jar                    | 0.9
 servlet.jar                         | Jetty 6.1.0 (2.5)
@@ -46,4 +47,4 @@ shaj.jar                            | 0.5
 sitemesh.jar                        | 2.2.1
 standard.jar                        | Jakarta standard taglib 1.1.2
 xmltask.jar                         | 1.11
-xpp3.jar                            | XPP_3 1.1.4c
+xpp3.jar                            | XPP_3 1.1.4c
\ No newline at end of file

src/java/org/jivesoftware/database/ConnectionProvider.java

@@ -45,6 +45,7 @@ public interface ConnectionProvider {
      * on the wrapper class will release the connection from the pool.
      *
      * @return a Connection object.
+     * @throws SQLException is an SQL error occured while retrieving the connection.
      */
     public Connection getConnection() throws SQLException;
 

src/java/org/jivesoftware/database/ConnectionWrapper.java

-/**
- * $RCSfile$
- * $Revision$
- * $Date$
- *
- * Copyright (C) 2004 Jive Software. All rights reserved.
- *
- * This software is published under the terms of the GNU Public License (GPL),
- * a copy of which is included in this distribution.
- */
-
-package org.jivesoftware.database;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * An implementation of the Connection interface that wraps an underlying
- * Connection object. It releases the connection back to a connection pool
- * when Connection.close() is called.
- *
- * @author Jive Software
- */
-public class ConnectionWrapper extends AbstractConnection {
-
-    public ConnectionPool pool;
-    public boolean checkedout = false;
-    public long createTime;
-    public long lockTime;
-    public long checkinTime;
-    public Exception exception;
-    public boolean hasLoggedException = false;
-
-    public ConnectionWrapper(Connection connection, ConnectionPool pool) {
-        super(connection);
-
-        this.pool = pool;
-        createTime = System.currentTimeMillis();
-        lockTime = createTime;
-        checkinTime = lockTime;
-    }
-
-    public void setConnection(Connection connection) {
-        super.connection = connection;
-    }
-
-    /**
-     * Instead of closing the underlying connection, we simply release
-     * it back into the pool.
-     */
-    public void close() throws SQLException {
-        synchronized (this) {
-            checkedout = false;
-            checkinTime = System.currentTimeMillis();
-        }
-
-        pool.freeConnection();
-
-        // Release object references. Any further method calls on the connection will fail.
-        // super.connection = null;
-    }
-
-    public String toString() {
-        if (connection != null) {
-            return connection.toString();
-        }
-        else {
-            return "Jive Software Connection Wrapper";
-        }
-    }
-
-    public synchronized boolean isCheckedOut() {
-        return checkedout;
-    }
-}

src/java/org/jivesoftware/database/DefaultConnectionProvider.java

@@ -14,9 +14,10 @@ package org.jivesoftware.database;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.Log;
 
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.DriverManager;
+import java.util.Properties;
 
 /**
  * Default Jive connection provider, which uses an internal connection pool.<p>
@@ -25,10 +26,10 @@ import java.sql.SQLException;
  */
 public class DefaultConnectionProvider implements ConnectionProvider {
 
-    private ConnectionPool connectionPool = null;
-
+    private Properties settings;
     private String driver;
     private String serverURL;
+    private String proxoolURL;
     private String username;
     private String password;
     private int minConnections = 3;
@@ -46,13 +47,13 @@ public class DefaultConnectionProvider implements ConnectionProvider {
      */
     private boolean mysqlUseUnicode;
 
-    private Object initLock = new Object();
-
     /**
      * Creates a new DefaultConnectionProvider.
      */
     public DefaultConnectionProvider() {
         loadProperties();
+
+        System.setProperty("org.apache.commons.logging.LogFactory", "org.jivesoftware.util.log.util.CommonsLogFactory");        
     }
 
     public boolean isPooled() {
@@ -60,71 +61,40 @@ public class DefaultConnectionProvider implements ConnectionProvider {
     }
 
     public Connection getConnection() throws SQLException {
-        if (connectionPool == null) {
-            // block until the init has been done
-            synchronized (initLock) {
-                // if still null, something has gone wrong
-                if (connectionPool == null) {
-                    Log.error("DbConnectionDefaultPool.getConnection() was " +
-                    "called before the internal pool has been initialized or " +
-                    "there was a problem connecting to the database.");
-                    // Attempt to connect again if setup was already done
-                    if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
-                        this.restart();
-                        if (connectionPool == null) {
-                            Log.error("Recovery logic failed to reconnect to the database.");
-                            return null;
-                        }
-                    }
-                    else {
-                        return null;
-                    }
-                }
+        Connection connection = null;
+        try {
+            Class.forName("org.logicalcobwebs.proxool.ProxoolDriver");
+            try {
+                connection = DriverManager.getConnection(proxoolURL, settings);
+            }
+            catch (SQLException e) {
+                Log.error("DbConnectionProvider: Error while getting connection: ", e);
             }
         }
-
-        return connectionPool.getConnection();
+        catch (ClassNotFoundException e) {
+            Log.error("DbConnectionProvider: Unable to find driver: ", e);
+        }
+        return connection;
     }
 
     public void start() {
-        // acquire lock so that no connections can be returned.
-        synchronized (initLock) {
-
-            try {
-                connectionPool = new ConnectionPool(driver, serverURL, username,
-                        password, minConnections, maxConnections, connectionTimeout,
-                        mysqlUseUnicode);
-            }
-            catch (IOException e) {
-                Log.error(e);
-            }
-        }
+        proxoolURL = "proxool.openfire:"+getDriver()+":"+getServerURL();
+        settings = new Properties();
+        settings.setProperty("proxool.maximum-connection-count", Integer.toString(getMaxConnections()));
+        settings.setProperty("proxool.minimum-connection-count", Integer.toString(getMinConnections()));
+        settings.setProperty("proxool.maximum-connection-lifetime", Integer.toString((int)(86400000 * getConnectionTimeout())));
+        settings.setProperty("proxool.test-before-use", "true");
+        settings.setProperty("proxool.test-after-use", "true");
+        settings.setProperty("proxool.house-keeping-test-sql", "select 1");
+        settings.setProperty("user", getUsername());
+        settings.setProperty("password", getPassword());
     }
 
     public void restart() {
-        // Kill off pool.
-        destroy();
-        // Reload properties.
-        loadProperties();
-        // Start a new pool.
-        start();
     }
 
     public void destroy() {
-        if (connectionPool != null) {
-            try {
-                connectionPool.destroy();
-            }
-            catch (Exception e) {
-                Log.error(e);
-            }
-        }
-        // Release reference to connectionPool
-        connectionPool = null;
-    }
-
-    public void finalize() {
-        destroy();
+        settings = null;
     }
 
     /**
@@ -293,7 +263,7 @@ public class DefaultConnectionProvider implements ConnectionProvider {
         String maxCons = JiveGlobals.getXMLProperty("database.defaultProvider.maxConnections");
         String conTimeout = JiveGlobals.getXMLProperty("database.defaultProvider.connectionTimeout");
         // See if we should use Unicode under MySQL
-        mysqlUseUnicode = Boolean.valueOf(JiveGlobals.getXMLProperty("database.mysql.useUnicode")).booleanValue();
+        mysqlUseUnicode = Boolean.valueOf(JiveGlobals.getXMLProperty("database.mysql.useUnicode"));
         try {
             if (minCons != null) {
                 minConnections = Integer.parseInt(minCons);
@@ -330,6 +300,6 @@ public class DefaultConnectionProvider implements ConnectionProvider {
     }
 
     public String toString() {
-        return connectionPool.toString();
+        return "Default Connection Provider";
     }
 }

src/java/org/jivesoftware/database/EmbeddedConnectionProvider.java

@@ -19,6 +19,8 @@ import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.DriverManager;
+import java.util.Properties;
 
 /**
  * A connection provider for the embedded hsqlDB database. The database file is stored at
@@ -30,55 +32,56 @@ import java.sql.Statement;
  */
 public class EmbeddedConnectionProvider implements ConnectionProvider {
 
-    private ConnectionPool connectionPool = null;
-    private final Object initLock = new Object();
+    private Properties settings;
+    private String serverURL;
+    private String driver = "org.hsqldb.jdbcDriver";
+    private String proxoolURL;
+
+    public EmbeddedConnectionProvider() {
+        System.setProperty("org.apache.commons.logging.LogFactory", "org.jivesoftware.util.log.util.CommonsLogFactory");
+    }
 
     public boolean isPooled() {
         return true;
     }
 
     public Connection getConnection() throws SQLException {
-        if (connectionPool == null) {
-            // Block until the init has been done
-            synchronized (initLock) {
-                // If still null, something has gone wrong
-                if (connectionPool == null) {
-                    Log.error("Error: EmbeddedConnectionProvider.getConnection() was" +
-                            "called before the internal pool has been initialized.");
-                    return null;
-                }
+        Connection connection = null;
+        try {
+            Class.forName("org.logicalcobwebs.proxool.ProxoolDriver");
+            try {
+                connection = DriverManager.getConnection(proxoolURL, settings);
+            }
+            catch (SQLException e) {
+                Log.error("EmbeddedConnectionProvider: Error while getting connection: ", e);
             }
         }
-        return connectionPool.getConnection();
+        catch (ClassNotFoundException e) {
+            Log.error("EmbeddedConnectionProvider: Unable to find driver: ", e);
+        }
+        return connection;
     }
 
     public void start() {
-        // Acquire lock so that no connections can be returned while creating the pool.
-        synchronized (initLock) {
-            try {
-                String driver = "org.hsqldb.jdbcDriver";
-                File databaseDir = new File(JiveGlobals.getHomeDirectory(), File.separator +
-                        "embedded-db");
-                // If the database doesn't exist, create it.
-                if (!databaseDir.exists()) {
-                    databaseDir.mkdirs();
-                }
-
-                String serverURL = "jdbc:hsqldb:" + databaseDir.getCanonicalPath() +
-                        File.separator + "openfire";
-                String username = "sa";
-                String password = "";
-                int minConnections = 3;
-                int maxConnections = 25;
-                double connectionTimeout = 0.5;
+        File databaseDir = new File(JiveGlobals.getHomeDirectory(), File.separator + "embedded-db");
+        // If the database doesn't exist, create it.
+        if (!databaseDir.exists()) {
+            databaseDir.mkdirs();
+        }
 
-                connectionPool = new ConnectionPool(driver, serverURL, username, password,
-                        minConnections, maxConnections, connectionTimeout, false);
-            }
-            catch (IOException ioe) {
-                Log.error("Error starting connection pool.", ioe);
-            }
+        try {
+            serverURL = "jdbc:hsqldb:" + databaseDir.getCanonicalPath() + File.separator + "openfire";
+        }
+        catch (IOException ioe) {
+            Log.error("EmbeddedConnectionProvider: Error starting connection pool: ", ioe);
         }
+        proxoolURL = "proxool.openfire:"+driver+":"+serverURL;
+        settings = new Properties();
+        settings.setProperty("proxool.maximum-connection-count", "25");
+        settings.setProperty("proxool.minimum-connection-count", "3");
+        settings.setProperty("proxool.maximum-connection-lifetime", Integer.toString((int)(86400000 * 0.5)));
+        settings.setProperty("user", "sa");
+        settings.setProperty("password", "");
     }
 
     public void restart() {
@@ -89,9 +92,6 @@ public class EmbeddedConnectionProvider implements ConnectionProvider {
     }
 
     public void destroy() {
-        if (connectionPool == null) {
-            return;
-        }
         // Shutdown the database.
         Connection con = null;
         try {
@@ -107,15 +107,8 @@ public class EmbeddedConnectionProvider implements ConnectionProvider {
             try { if (con != null) { con.close(); } }
             catch (Exception e) { Log.error(e); }
         }
-        // Close the connection pool.
-        try {
-            connectionPool.destroy();
-        }
-        catch (Exception e) {
-            Log.error(e);
-        }
-        // Release reference to connectionPool
-        connectionPool = null;
+        // Blank out the settings
+        settings = null;
     }
 
     public void finalize() throws Throwable {

src/web/WEB-INF/web.xml

@@ -89,6 +89,11 @@
         <servlet-name>dwr-invoker</servlet-name>
     </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>AuthCheck</filter-name>
+        <servlet-name>Proxool</servlet-name>
+    </filter-mapping>
+
 
     <listener>
         <listener-class>org.jivesoftware.openfire.XMPPContextListener</listener-class>
@@ -116,9 +121,23 @@
         <servlet-class>org.jivesoftware.openfire.container.PluginIconServlet</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>Proxool</servlet-name>
+        <servlet-class>org.logicalcobwebs.proxool.admin.servlet.AdminServlet</servlet-class>
+        <init-param>
+            <param-name>output</param-name>
+            <param-value>full</param-value>
+        </init-param>
+    </servlet>
+
 
     <!--@@JSPC-SERVLETS@@-->
 
+    <servlet-mapping>
+        <servlet-name>Proxool</servlet-name>
+        <url-pattern>/proxool</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>PluginServlet</servlet-name>
         <url-pattern>/plugins/*</url-pattern>