summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-02-24 18:04:01 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-03-12 16:24:50 +0000
commita594087f06795ae19f7eaf22df314be83dd7286f (patch)
treec70d35d50d88a2acf84d573eb960d29c4eebaf25
parentAn initial implementation of a 'metrics' instance, similar to a 'logger' for ... (diff)
downloadsynapse-a594087f06795ae19f7eaf22df314be83dd7286f.tar.xz
Have the MetricsResource actually render metric counters
-rw-r--r--synapse/metrics/resource.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/metrics/resource.py b/synapse/metrics/resource.py
index b480484624..2b9a1ee0a9 100644
--- a/synapse/metrics/resource.py
+++ b/synapse/metrics/resource.py
@@ -16,6 +16,8 @@
 from twisted.web.resource import Resource
 from twisted.web.server import NOT_DONE_YET
 
+import synapse.metrics
+
 
 METRICS_PREFIX = "/_synapse/metrics"
 
@@ -29,7 +31,7 @@ class MetricsResource(Resource):
         self.hs = hs
 
     def render_GET(self, request):
-        response = "Hello, world!"
+        response = synapse.metrics.render_all()
 
         request.setHeader("Content-Type", "text/plain")
         request.setHeader("Content-Length", str(len(response)))