summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-03-19 09:46:12 -0400
committerGitHub <noreply@github.com>2020-03-19 09:46:12 -0400
commite24928de9906ecbab5580dafe443b8bdea2e4322 (patch)
tree43fb62058bfdf6631b243ffb31311ff389a5f1d7 /synapse
parentShare SSL contexts for non-federation requests (#30) (diff)
downloadsynapse-e24928de9906ecbab5580dafe443b8bdea2e4322.tar.xz
Fixes an attribute error when using the default display name during registration. (#32)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/app/client_reader.py2
-rw-r--r--synapse/replication/slave/storage/user_directory.py22
2 files changed, 24 insertions, 0 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py

index a16e037f32..cd49fc5cd3 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py
@@ -44,6 +44,7 @@ from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore from synapse.replication.slave.storage.room import RoomStore from synapse.replication.slave.storage.transactions import SlavedTransactionStore +from synapse.replication.slave.storage.user_directory import SlavedUserDirectoryStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.rest.client.v1.login import LoginRestServlet from synapse.rest.client.v1.push_rule import PushRuleRestServlet @@ -84,6 +85,7 @@ class ClientReaderSlavedStore( SlavedTransactionStore, SlavedProfileStore, SlavedClientIpStore, + SlavedUserDirectoryStore, BaseSlavedStore, ): pass diff --git a/synapse/replication/slave/storage/user_directory.py b/synapse/replication/slave/storage/user_directory.py new file mode 100644
index 0000000000..0d7b1a4a83 --- /dev/null +++ b/synapse/replication/slave/storage/user_directory.py
@@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2020 The Matrix.org Foundation C.I.C. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from synapse.storage.user_directory import UserDirectoryStore + +from ._base import BaseSlavedStore + + +class SlavedUserDirectoryStore(UserDirectoryStore, BaseSlavedStore): + pass