Merge pull request #6243 from matrix-org/babolivier/port_db_fix_imports

Fix import paths in synapse_port_db
pull/6247/head
Brendan Abolivier 2019-10-23 16:44:43 +01:00 committed by GitHub
commit e9a8c05bef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions

1
changelog.d/6243.bugfix Normal file
View File

@ -0,0 +1 @@
Make the `synapse_port_db` script create the right indexes on a new PostgreSQL database.

View File

@ -33,19 +33,27 @@ from twisted.internet import defer, reactor
from synapse.config.homeserver import HomeServerConfig from synapse.config.homeserver import HomeServerConfig
from synapse.logging.context import PreserveLoggingContext from synapse.logging.context import PreserveLoggingContext
from synapse.storage._base import LoggingTransaction from synapse.storage._base import LoggingTransaction
from synapse.storage.client_ips import ClientIpBackgroundUpdateStore from synapse.storage.data_stores.main.client_ips import ClientIpBackgroundUpdateStore
from synapse.storage.deviceinbox import DeviceInboxBackgroundUpdateStore from synapse.storage.data_stores.main.deviceinbox import DeviceInboxBackgroundUpdateStore
from synapse.storage.devices import DeviceBackgroundUpdateStore from synapse.storage.data_stores.main.devices import DeviceBackgroundUpdateStore
from synapse.storage.engines import create_engine from synapse.storage.engines import create_engine
from synapse.storage.events_bg_updates import EventsBackgroundUpdatesStore from synapse.storage.data_stores.main.events_bg_updates import (
from synapse.storage.media_repository import MediaRepositoryBackgroundUpdateStore EventsBackgroundUpdatesStore
)
from synapse.storage.data_stores.main.media_repository import (
MediaRepositoryBackgroundUpdateStore
)
from synapse.storage.prepare_database import prepare_database from synapse.storage.prepare_database import prepare_database
from synapse.storage.registration import RegistrationBackgroundUpdateStore from synapse.storage.data_stores.main.registration import (
from synapse.storage.roommember import RoomMemberBackgroundUpdateStore RegistrationBackgroundUpdateStore
from synapse.storage.search import SearchBackgroundUpdateStore )
from synapse.storage.state import StateBackgroundUpdateStore from synapse.storage.data_stores.main.roommember import RoomMemberBackgroundUpdateStore
from synapse.storage.stats import StatsStore from synapse.storage.data_stores.main.search import SearchBackgroundUpdateStore
from synapse.storage.user_directory import UserDirectoryBackgroundUpdateStore from synapse.storage.data_stores.main.state import StateBackgroundUpdateStore
from synapse.storage.data_stores.main.stats import StatsStore
from synapse.storage.data_stores.main.user_directory import (
UserDirectoryBackgroundUpdateStore
)
from synapse.util import Clock from synapse.util import Clock
logger = logging.getLogger("synapse_port_db") logger = logging.getLogger("synapse_port_db")