storage: teach shutdown to close all connections

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2735 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/storage/app.py

@@ -362,8 +362,10 @@ class Application(object):
     def shutdown(self, erase=False):
         """Close all connections and exit"""
         for c in self.em.getConnectionList():
-            if not c.isListening():
+            try:
                 c.close()
+            except PrimaryFailure:
+                pass
         # clear database to avoid polluting the cluster at restart
         self.dm.setup(reset=erase)
         sys.exit("Application has been asked to shut down")

neo/storage/handlers/__init__.py

@@ -51,11 +51,6 @@ class BaseMasterHandler(EventHandler):
                 neo.lib.logging.info("I was told I'm %s" %(state))
                 if state in (NodeStates.DOWN, NodeStates.TEMPORARILY_DOWN,
                         NodeStates.BROKEN):
-                    try:
-                        conn.close()
-                        assert False
-                    except PrimaryFailure:
-                        pass
                     erase = state == NodeStates.DOWN
                     self.app.shutdown(erase=erase)
                 elif state == NodeStates.HIDDEN: