Partial revert of previous commit, some files were commited by error, sorry.

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

neo/connection.py

@@ -25,7 +25,6 @@ from neo.connector import ConnectorException, ConnectorTryAgainException, \
         ConnectorInProgressException, ConnectorConnectionRefusedException, \
         ConnectorConnectionClosedException
 from neo.util import dump
-from neo.logger import PACKET_LOGGER
 
 def not_closed(func):
     def decorator(self, *args, **kw):
@@ -358,11 +357,6 @@ class Connection(BaseConnection):
             logging.debug('#0x%08x ERROR %-24s %s %s (%s:%d) %s',
                 packet.getId(), code, direction, dump(self.uuid),
                 ip, port, message)
-        elif packet_type == protocol.ANSWER_PRIMARY_MASTER:
-            primary, masters = packet.decode()
-            logging.debug('#0x%08x ANSWER_PRIMARY_MASTER : %s/%s  %s %s (%s:%d)' % 
-                    (packet.getId(), dump(primary), masters, direction, 
-                        dump(self.uuid), ip, port))
         else:
             logging.debug('#0x%08x %-30s %s %s (%s:%d)', packet.getId(),
                 packet_type, direction, dump(self.uuid),
@@ -373,8 +367,7 @@ class Connection(BaseConnection):
         if self.connector is None:
             return
 
-        PACKET_LOGGER.log(self, packet, ' to ')
-        #self.logPacket(' to ', packet)
+        self.logPacket(' to ', packet)
         try:
             self.write_buf += packet.encode()
         except PacketMalformedError, m:

neo/master/handlers/election.py

@@ -113,9 +113,6 @@ class ClientElectionHandler(ElectionHandler):
         app.negotiating_master_node_set.discard(addr)
         MasterHandler.peerBroken(self, conn)
 
-    def handleNotifyClusterInformation(self, conn, packet, state):
-        logging.warning('Ignore cluster information notification')
-
     def handleAcceptNodeIdentification(self, conn, packet, node_type,
                                        uuid, address, num_partitions,
                                        num_replicas, your_uuid):

runner

@@ -67,8 +67,6 @@ FUNC_TEST_MODULES = [
 # configuration 
 UNIT_TESTS = True
 FUNCTIONAL_TESTS = True
-FUNCTIONAL_TESTS = False
-SEND_REPORT = True
 SEND_REPORT = False
 CONSOLE_LOG = False
 ATTACH_LOG = False # for ZODB test, only the client side is logged