[Neo-report] r2104 vincent - in /trunk/neo/client: app.py handlers/storage.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu May 13 20:54:56 CEST 2010
Author: vincent
Date: Thu May 13 20:54:56 2010
New Revision: 2104
Log:
Extend conflict logging on client.
Modified:
trunk/neo/client/app.py
trunk/neo/client/handlers/storage.py
Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Thu May 13 20:54:56 2010
@@ -618,6 +618,8 @@
new_data = tryToResolveConflict(oid, conflict_serial, serial,
data)
if new_data is not None:
+ logging.info('Conflict resolution succeed for %r:%r with %r',
+ dump(oid), dump(serial), dump(conflict_serial))
# Mark this conflict as resolved
resolved_conflict_serial_dict[oid] = \
conflict_serial_dict.pop(oid)
@@ -626,6 +628,12 @@
local_var.txn)
append(oid)
resolved = True
+ else:
+ logging.info('Conflict resolution failed for %r:%r with %r',
+ dump(oid), dump(serial), dump(conflict_serial))
+ else:
+ logging.info('Conflict reported for %r:%r with later ' \
+ 'transaction %r , cannot resolve conflict.')
if not resolved:
# XXX: Is it really required to remove from data_dict ?
del data_dict[oid]
Modified: trunk/neo/client/handlers/storage.py
==============================================================================
--- trunk/neo/client/handlers/storage.py [iso-8859-1] (original)
+++ trunk/neo/client/handlers/storage.py [iso-8859-1] Thu May 13 20:54:56 2010
@@ -17,6 +17,7 @@
from ZODB.TimeStamp import TimeStamp
+from neo import logging
from neo.client.handlers import BaseHandler, AnswerBaseHandler
from neo.protocol import NodeTypes, ProtocolError
from neo.util import dump
@@ -71,6 +72,8 @@
local_var = self.app.local_var
object_stored_counter_dict = local_var.object_stored_counter_dict[oid]
if conflicting:
+ logging.info('%r report a conflict for %r with %r', conn,
+ dump(oid), dump(serial))
conflict_serial_dict = local_var.conflict_serial_dict
pending_serial = conflict_serial_dict.get(oid)
resolved_serial = local_var.resolved_conflict_serial_dict.get(oid)
More information about the Neo-report
mailing list