[Mpuls-commits] r1006 - in wasko/branches/2.0: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-29 11:09:00 +0100 (Fri, 29 Jan 2010)
New Revision: 1006

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/lib/db.py
Log:
* waskaweb/lib/db.py (DB.closeConnections): Call the close()
method of the connection objects, not the booleans in
self.connections.  This error was masked because exceptions were
silently suppressed.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-29 10:05:58 UTC (rev 1005)
+++ wasko/branches/2.0/ChangeLog	2010-01-29 10:09:00 UTC (rev 1006)
@@ -1,5 +1,12 @@
 2010-01-29  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/db.py (DB.closeConnections): Call the close()
+	method of the connection objects, not the booleans in
+	self.connections.  This error was masked because exceptions were
+	silently suppressed.
+
+2010-01-29  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/lib/db.py (DB.recycleConnection, DB.closeConnections):
 	Use the logging module to log warnings.  Also, do not ignore
 	exceptions, log them.

Modified: wasko/branches/2.0/waskaweb/lib/db.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/db.py	2010-01-29 10:05:58 UTC (rev 1005)
+++ wasko/branches/2.0/waskaweb/lib/db.py	2010-01-29 10:09:00 UTC (rev 1006)
@@ -94,7 +94,7 @@
             if used[0]:
                 log.warning("WARNING: Closing an unrecycled connection")
             try:
-                used[0].close()
+                used[1].close()
             except:
                 log.exception("Error ignored while closing connection")