This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 3
Add the UserDirectoryStore to the ClientReaderSlavedStore. #32
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erikjohnston
approved these changes
Mar 19, 2020
@@ -84,6 +85,7 @@ class ClientReaderSlavedStore( | |||
SlavedTransactionStore, | |||
SlavedProfileStore, | |||
SlavedClientIpStore, | |||
SlavedUserDirectoryStore, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH I'd be tempted to just inherit from UserDirectoryStore
directly, since SlavedUserDirectoryStore
doesn't really do anything. YMMV
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I followed the pattern of the DirectoryStore
which does the same thing:
synapse-dinsic/synapse/replication/slave/storage/directory.py
Lines 16 to 22 in 85845e0
from synapse.storage.directory import DirectoryWorkerStore | |
from ._base import BaseSlavedStore | |
class DirectoryStore(DirectoryWorkerStore, BaseSlavedStore): | |
pass |
Happy to simplify it though if you'd like!
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.1.0 * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.2.0 * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.3.0 * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.4.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.5.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.6.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.7.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.8.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.9.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.11.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
anoadragon453
added a commit
that referenced
this pull request
Mar 24, 2020
…nsic-release-v1.12.x * 'dinsic' of github.com:matrix-org/synapse-dinsic: Fixes an attribute error when using the default display name during registration. (#32) Share SSL contexts for non-federation requests (#30) Share SSL options for well-known requests (#29) Fix buggy condition in account validity handler (#28)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is necessary for the register API endpoint to be able to access the user directory.
This PR takes a naive approach to pass the store through. I'm fairly confident the method in question (
update_profile_in_user_dir
) is OK to run on a worker, but not sure if the other methods are.This differs a bit from master, due to 32e4420.