Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:56:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into event_signing

Browse source 
Conflicts:
	synapse/federation/replication.py
This commit is contained in:
Mark Haines 2014-10-17 17:33:58 +01:00
commit dc3c2823ac
21 changed files with 101 additions and 849 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/federation/replication.py
View file

@ -427,7 +427,7 @@ class ReplicationLayer(object):
return Transaction(
origin=self.server_name,
pdus=pdus,
ts=int(time_now),
origin_server_ts=int(time_now),
destination=None,
)
@ -595,7 +595,7 @@ class _TransactionQueue(object):
logger.debug("TX [%s] Persisting transaction...", destination)
transaction = Transaction.create_new(
ts=int(self._clock.time_msec()),
origin_server_ts=int(self._clock.time_msec()),
transaction_id=str(self._next_txn_id),
origin=self.server_name,
destination=destination,