diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-09 13:53:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-09 13:53:21 +0000 |
| commit | 30e9adf32f7db9aa44693876d33692bf4590d363 (patch) | |
| tree | 9b83e1dc2eeefaafe8eca4e5b95cffdf8572b346 /synapse/app/federation_sender.py | |
| parent | Merge pull request #6493 from matrix-org/erikj/invite_state_config (diff) | |
| parent | Fix comment (diff) | |
| download | synapse-30e9adf32f7db9aa44693876d33692bf4590d363.tar.xz | |
Merge pull request #6487 from matrix-org/erikj/pass_in_db
Pass in Database object to data stores.
Diffstat (limited to 'synapse/app/federation_sender.py')
| -rw-r--r-- | synapse/app/federation_sender.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py index 448e45e00f..f24920a7d6 100644 --- a/synapse/app/federation_sender.py +++ b/synapse/app/federation_sender.py @@ -40,6 +40,7 @@ from synapse.replication.slave.storage.transactions import SlavedTransactionStor from synapse.replication.tcp.client import ReplicationClientHandler from synapse.replication.tcp.streams._base import ReceiptsStream from synapse.server import HomeServer +from synapse.storage.database import Database from synapse.storage.engines import create_engine from synapse.types import ReadReceipt from synapse.util.async_helpers import Linearizer @@ -59,8 +60,8 @@ class FederationSenderSlaveStore( SlavedDeviceStore, SlavedPresenceStore, ): - def __init__(self, db_conn, hs): - super(FederationSenderSlaveStore, self).__init__(db_conn, hs) + def __init__(self, database: Database, db_conn, hs): + super(FederationSenderSlaveStore, self).__init__(database, db_conn, hs) # We pull out the current federation stream position now so that we # always have a known value for the federation position in memory so |