QAR-622 merge -r91846:91877 svn+ssh://svn/svn/linden/branches/scut-newstyle-5

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/lib/python/indra/ipc/mysql_pool.py b/indra/lib/python/indra/ipc/mysql_pool.py
index 2a5a916e74..a2324cf956 100644
--- a/indra/lib/python/indra/ipc/mysql_pool.py
+++ b/indra/lib/python/indra/ipc/mysql_pool.py
@@ -76,3 +76,15 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
         converted_kwargs.update(self._kwargs)
         conn.connection_parameters = converted_kwargs
         return conn
+
+    def clear(self):
+        """ Close all connections that this pool still holds a reference to, leaving it empty."""
+        for conn in self.free_items:
+            try:
+                conn.close()
+            except:
+                pass   # even if stuff happens here, we still want to at least try to close all the other connections
+        self.free_items.clear()
+            
+    def __del__(self):
+        self.clear()