Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Add the UserDirectoryStore to the ClientReaderSlavedStore. #32

Merged
merged 2 commits into from
Mar 19, 2020

Conversation

clokep
Copy link
Member

@clokep clokep commented Mar 18, 2020

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.

@clokep clokep requested a review from a team March 18, 2020 16:48
@@ -84,6 +85,7 @@ class ClientReaderSlavedStore(
SlavedTransactionStore,
SlavedProfileStore,
SlavedClientIpStore,
SlavedUserDirectoryStore,
Copy link
Member

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

Copy link
Member Author

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:

from synapse.storage.directory import DirectoryWorkerStore
from ._base import BaseSlavedStore
class DirectoryStore(DirectoryWorkerStore, BaseSlavedStore):
pass

Happy to simplify it though if you'd like!

@clokep clokep merged commit e24928d into dinsic Mar 19, 2020
@clokep clokep deleted the clokep/user-directory-slave-store branch March 19, 2020 13:46
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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants