diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-05-29 00:25:22 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-05-29 00:25:22 +0100 |
| commit | 7a6df013cc8a128278d2ce7e5eb569e0b424f9b0 (patch) | |
| tree | 5de624a65953eb96ab67274462d850a88c0cce3c /synapse/http/additional_resource.py | |
| parent | make lazy_load_members configurable in filters (diff) | |
| parent | Merge pull request #3256 from matrix-org/3218-official-prom (diff) | |
| download | synapse-7a6df013cc8a128278d2ce7e5eb569e0b424f9b0.tar.xz | |
merge develop
Diffstat (limited to 'synapse/http/additional_resource.py')
| -rw-r--r-- | synapse/http/additional_resource.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/http/additional_resource.py b/synapse/http/additional_resource.py index 343e932cb1..a797396ade 100644 --- a/synapse/http/additional_resource.py +++ b/synapse/http/additional_resource.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.http.server import wrap_request_handler +from synapse.http.server import wrap_json_request_handler from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET @@ -42,14 +42,13 @@ class AdditionalResource(Resource): Resource.__init__(self) self._handler = handler - # these are required by the request_handler wrapper - self.version_string = hs.version_string + # required by the request_handler wrapper self.clock = hs.get_clock() def render(self, request): self._async_render(request) return NOT_DONE_YET - @wrap_request_handler + @wrap_json_request_handler def _async_render(self, request): return self._handler(request) |