server/pool.py
branchstable
changeset 7815 2a164a9cf81c
parent 7398 26695dd703d8
child 8238 087bb529035c
--- a/server/pool.py	Tue Sep 20 15:14:04 2011 +0200
+++ b/server/pool.py	Wed Sep 21 17:38:00 2011 +0200
@@ -73,7 +73,7 @@
             # catch exceptions, rollback other sources anyway
             try:
                 cnx.rollback()
-            except:
+            except Exception:
                 source.critical('rollback error', exc_info=sys.exc_info())
                 # error on rollback, the connection is much probably in a really
                 # bad state. Replace it by a new one.
@@ -86,12 +86,12 @@
         for cu in self._cursors.values():
             try:
                 cu.close()
-            except:
+            except Exception:
                 continue
         for _, cnx in self.source_cnxs.values():
             try:
                 cnx.close()
-            except:
+            except Exception:
                 continue
 
     # internals ###############################################################
@@ -135,7 +135,7 @@
             try:
                 # properly close existing connection if any
                 self.source_cnxs[source.uri][1].close()
-            except:
+            except Exception:
                 pass
             source.info('trying to reconnect')
             self.source_cnxs[source.uri] = (source, source.get_connection())