diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-01 16:23:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 16:23:54 +0000 |
| commit | 22518e2833f988f75e24ced851c6b44b718e1e5c (patch) | |
| tree | f4819940a763a31dd3ed862de404ac5badac65b2 /synapse/storage/__init__.py | |
| parent | Merge pull request #2922 from matrix-org/erikj/split_room_store (diff) | |
| parent | Default stream_ordering_*_ago to None (diff) | |
| download | synapse-22518e2833f988f75e24ced851c6b44b718e1e5c.tar.xz | |
Merge pull request #2923 from matrix-org/erikj/stream_ago_worker
Calculate stream_ordering_month_ago correctly on workers
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 0f136f8a06..b3cdcfdc21 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -20,7 +20,6 @@ from synapse.storage.devices import DeviceStore from .appservice import ( ApplicationServiceStore, ApplicationServiceTransactionStore ) -from ._base import LoggingTransaction from .directory import DirectoryStore from .events import EventsStore from .presence import PresenceStore, UserPresenceState @@ -228,20 +227,6 @@ class DataStore(RoomMemberStore, RoomStore, prefilled_cache=_group_updates_prefill, ) - cur = LoggingTransaction( - db_conn.cursor(), - name="_find_stream_orderings_for_times_txn", - database_engine=self.database_engine, - after_callbacks=[], - final_callbacks=[], - ) - self._find_stream_orderings_for_times_txn(cur) - cur.close() - - self.find_stream_orderings_looping_call = self._clock.looping_call( - self._find_stream_orderings_for_times, 10 * 60 * 1000 - ) - self._stream_order_on_start = self.get_room_max_stream_ordering() self._min_stream_order_on_start = self.get_room_min_stream_ordering() |