diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:12:25 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:12:25 +0100 |
| commit | f5cf7ac25b311fda8a2d553f07437b3648c66f6c (patch) | |
| tree | 62d43c8acf91281f59239f331745e9796a0f827e /synapse/federation/replication.py | |
| parent | SPEC-7: Don't stamp event contents with 'hsob_ts' (diff) | |
| download | synapse-f5cf7ac25b311fda8a2d553f07437b3648c66f6c.tar.xz | |
SPEC-7: Rename 'ts' to 'origin_server_ts'
Diffstat (limited to 'synapse/federation/replication.py')
| -rw-r--r-- | synapse/federation/replication.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py index 9363ac7300..092411eaf9 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py @@ -421,7 +421,7 @@ class ReplicationLayer(object): return Transaction( origin=self.server_name, pdus=pdus, - ts=int(self._clock.time_msec()), + origin_server_ts=int(self._clock.time_msec()), destination=None, ) @@ -589,7 +589,7 @@ class _TransactionQueue(object): logger.debug("TX [%s] Persisting transaction...", destination) transaction = Transaction.create_new( - ts=self._clock.time_msec(), + origin_server_ts=self._clock.time_msec(), transaction_id=str(self._next_txn_id), origin=self.server_name, destination=destination, |