diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-05-09 23:44:22 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-05-10 12:19:52 +0100 |
| commit | 49e5a613f1ac53498b31150f78332fc64932e61b (patch) | |
| tree | b269d8666f9c0f270a94f30e88ce470e24e6d962 | |
| parent | Bump requests_counter in wrapped_request_handler (diff) | |
| download | synapse-49e5a613f1ac53498b31150f78332fc64932e61b.tar.xz | |
Move outgoing_responses_counter handling to RequestMetrics
it's much neater there.
| -rw-r--r-- | synapse/http/request_metrics.py | 2 | ||||
| -rw-r--r-- | synapse/http/server.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/http/request_metrics.py b/synapse/http/request_metrics.py index 4e8a5f5306..8c850bf23f 100644 --- a/synapse/http/request_metrics.py +++ b/synapse/http/request_metrics.py @@ -119,6 +119,8 @@ class RequestMetrics(object): ) return + outgoing_responses_counter.inc(request.method, str(request.code)) + response_count.inc(request.method, self.name, tag) response_timer.inc_by( diff --git a/synapse/http/server.py b/synapse/http/server.py index 1d05b53873..200b2c4837 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -20,7 +20,6 @@ from synapse.api.errors import ( ) from synapse.http.request_metrics import ( requests_counter, - outgoing_responses_counter, ) from synapse.util.logcontext import LoggingContext, PreserveLoggingContext from synapse.util.caches import intern_dict @@ -112,7 +111,6 @@ def wrap_request_handler(request_handler, include_metrics=False): ) else: logger.exception(e) - outgoing_responses_counter.inc(request.method, str(code)) respond_with_json( request, code, cs_exception(e), send_cors=True, pretty_print=_request_user_agent_is_curl(request), @@ -274,8 +272,6 @@ class JsonResource(HttpServer, resource.Resource): def _send_response(self, request, code, response_json_object, response_code_message=None): - outgoing_responses_counter.inc(request.method, str(code)) - # TODO: Only enable CORS for the requests that need it. respond_with_json( request, code, response_json_object, |