Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
40a1fddd
Unverified
Commit
40a1fddd
authored
3 years ago
by
Andrew Morgan
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Allow `room_alias_name` parameter to be handled by /createRoom calls on workers (#10757)
parent
7bb3673f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/10757.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/10757.bugfix
synapse/storage/databases/main/directory.py
+2
-2
2 additions, 2 deletions
synapse/storage/databases/main/directory.py
with
3 additions
and
2 deletions
changelog.d/10757.bugfix
0 → 100644
+
1
−
0
View file @
40a1fddd
Fix a bug which prevented calls to `/createRoom` that included the `room_alias_name` parameter from being handled by worker processes.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
synapse/storage/databases/main/directory.py
+
2
−
2
View file @
40a1fddd
...
@@ -75,8 +75,6 @@ class DirectoryWorkerStore(SQLBaseStore):
...
@@ -75,8 +75,6 @@ class DirectoryWorkerStore(SQLBaseStore):
desc
=
"
get_aliases_for_room
"
,
desc
=
"
get_aliases_for_room
"
,
)
)
class
DirectoryStore
(
DirectoryWorkerStore
):
async
def
create_room_alias_association
(
async
def
create_room_alias_association
(
self
,
self
,
room_alias
:
RoomAlias
,
room_alias
:
RoomAlias
,
...
@@ -126,6 +124,8 @@ class DirectoryStore(DirectoryWorkerStore):
...
@@ -126,6 +124,8 @@ class DirectoryStore(DirectoryWorkerStore):
409
,
"
Room alias %s already exists
"
%
room_alias
.
to_string
()
409
,
"
Room alias %s already exists
"
%
room_alias
.
to_string
()
)
)
class
DirectoryStore
(
DirectoryWorkerStore
):
async
def
delete_room_alias
(
self
,
room_alias
:
RoomAlias
)
->
str
:
async
def
delete_room_alias
(
self
,
room_alias
:
RoomAlias
)
->
str
:
room_id
=
await
self
.
db_pool
.
runInteraction
(
room_id
=
await
self
.
db_pool
.
runInteraction
(
"
delete_room_alias
"
,
self
.
_delete_room_alias_txn
,
room_alias
"
delete_room_alias
"
,
self
.
_delete_room_alias_txn
,
room_alias
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment