Fix 'age' key to update on retries

This commit is contained in:
Erik Johnston 2014-09-15 14:54:25 +01:00
parent 34d7896b06
commit 6ac0b4ade8
3 changed files with 41 additions and 8 deletions

View file

@ -292,8 +292,8 @@ class ReplicationLayer(object):
transaction = Transaction(**transaction_data)
for p in transaction.pdus:
if "age" in p:
p["age_ts"] = int(self.clock.time_msec()) - int(p["age"])
if "age_ts" in p:
p["age"] = int(self._clock.time_msec()) - int(p["age_ts"])
pdu_list = [Pdu(**p) for p in transaction.pdus]
@ -602,8 +602,21 @@ class _TransactionQueue(object):
logger.debug("TX [%s] Sending transaction...", destination)
# Actually send the transaction
# FIXME (erikj): This is a bit of a hack to make the Pdu age
# keys work
def cb(transaction):
now = int(self._clock.time_msec())
if "pdus" in transaction:
for p in transaction["pdus"]:
if "age_ts" in p:
p["age"] = now - int(p["age_ts"])
return transaction
code, response = yield self.transport_layer.send_transaction(
transaction
transaction,
on_send_callback=cb,
)
logger.debug("TX [%s] Sent transaction", destination)