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

Merge different Resource implementation classes #7732

Merged
merged 14 commits into from
Jul 3, 2020
Merged

Merge different Resource implementation classes #7732

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8c47577
Pull out error handling from 'wrap_json_request_handler'
erikjohnston Jun 22, 2020
65a5e16
Abstract out request handling from JsonResource
erikjohnston Jun 22, 2020
99be35e
Create and use DirectServer*Resource classes
erikjohnston Jun 22, 2020
f5b7968
Newsfile
erikjohnston Jun 22, 2020
328a4a6
Fix mypy
erikjohnston Jun 22, 2020
c31f298
Fix missed type
erikjohnston Jun 22, 2020
d575477
Fix up _get_handler_for_request type
erikjohnston Jun 23, 2020
ffbddb6
Add support for '_async_render' fallback and use it
erikjohnston Jun 23, 2020
3bb4db7
Remove unused function and attribute
erikjohnston Jun 23, 2020
7fee362
Add very basic additonal resource tests
erikjohnston Jun 23, 2020
40b84a0
Rejig everything
erikjohnston Jun 25, 2020
f0f2baf
Fix up comments and unused vars
erikjohnston Jun 30, 2020
b140b68
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/me…
erikjohnston Jul 3, 2020
e0f8986
Add back comments. Use respond_with_html_bytes
erikjohnston Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7732.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix "Tried to close a non-active scope!" error messages when opentracing is enabled.
Loading