Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move some rest endpoints to client reader #5063

Merged
merged 3 commits into from Apr 15, 2019

Conversation

Projects
None yet
2 participants
@erikjohnston
Copy link
Member

commented Apr 15, 2019

No description provided.

@erikjohnston erikjohnston force-pushed the erikj/move_endpoints branch from cb5677b to f3b6cba Apr 15, 2019

@erikjohnston erikjohnston force-pushed the erikj/move_endpoints branch from f3b6cba to 2082519 Apr 15, 2019

@erikjohnston erikjohnston requested a review from matrix-org/synapse-core Apr 15, 2019

@@ -109,12 +112,12 @@ def _listen_http(self, listener_config):
ThreepidRestServlet(self).register(resource)
KeyQueryServlet(self).register(resource)
KeyChangesServlet(self).register(resource)
VoipRestServlet(self).register(resource)
PushRuleRestServlet(self).register(resource)

This comment has been minimized.

Copy link
@richvdh

richvdh Apr 15, 2019

Member

surely you can only safely move GET /pushrules to the worker?

This comment has been minimized.

Copy link
@erikjohnston

erikjohnston Apr 15, 2019

Author Member

Oh argh.

This comment has been minimized.

Copy link
@erikjohnston

erikjohnston Apr 15, 2019

Author Member

Fixed?

@codecov

This comment has been minimized.

Copy link

commented Apr 15, 2019

Codecov Report

Merging #5063 into develop will decrease coverage by 0.76%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           develop   #5063      +/-   ##
==========================================
- Coverage    61.57%   60.8%   -0.77%     
==========================================
  Files          332     332              
  Lines        34265   34228      -37     
  Branches      5648    5647       -1     
==========================================
- Hits         21097   20811     -286     
- Misses       11654   11874     +220     
- Partials      1514    1543      +29
@richvdh
Copy link
Member

left a comment

lgtm otherwise

@@ -103,6 +107,9 @@ def on_PUT(self, request):

@defer.inlineCallbacks
def on_DELETE(self, request):
if self._is_worker:
raise Exception("Cannot handle PUT /push_rules on worker")

This comment has been minimized.

Copy link
@richvdh

richvdh Apr 15, 2019

Member

DELETE

@erikjohnston erikjohnston force-pushed the erikj/move_endpoints branch from 548fb07 to ec638a1 Apr 15, 2019

@erikjohnston erikjohnston merged commit 6e27a86 into develop Apr 15, 2019

6 of 22 checks passed

buildkite/synapse Build #991 started
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Started...
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Started...
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Started...
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Started...
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Started...
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Started...
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Started...
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Started...
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Started...
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Started...
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Started...
Details
ci/circleci: sytestpy2merged CircleCI is running your tests
Details
ci/circleci: sytestpy2postgresmerged CircleCI is running your tests
Details
ci/circleci: sytestpy3merged CircleCI is running your tests
Details
ci/circleci: sytestpy3postgresmerged CircleCI is running your tests
Details
buildkite/synapse/check-sample-config Passed (1 minute, 28 seconds)
Details
buildkite/synapse/isort Passed (17 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (15 seconds)
Details
buildkite/synapse/packaging Passed (17 seconds)
Details
buildkite/synapse/pep-8 Passed (1 minute, 6 seconds)
Details
buildkite/synapse/pipeline Passed (2 seconds)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.