From 5b6e11d560e274e8690417b21300ca1a79a24d92 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Tue, 24 Feb 2015 14:30:14 +0000
Subject: Commandline option to enable metrics system

---
 synapse/config/homeserver.py |  4 +++-
 synapse/config/metrics.py    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 synapse/config/metrics.py

(limited to 'synapse/config')

diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index c024535f52..241afdf872 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -23,11 +23,13 @@ from .captcha import CaptchaConfig
 from .email import EmailConfig
 from .voip import VoipConfig
 from .registration import RegistrationConfig
+from .metrics import MetricsConfig
 
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
                        RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
-                       EmailConfig, VoipConfig, RegistrationConfig,):
+                       EmailConfig, VoipConfig, RegistrationConfig,
+                       MetricsConfig,):
     pass
 
 
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py
new file mode 100644
index 0000000000..90aba10bba
--- /dev/null
+++ b/synapse/config/metrics.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from ._base import Config
+
+
+class MetricsConfig(Config):
+    def __init__(self, args):
+        super(MetricsConfig, self).__init__(args)
+        self.enable_metrics = args.enable_metrics
+
+    @classmethod
+    def add_arguments(cls, parser):
+        super(MetricsConfig, cls).add_arguments(parser)
+        metrics_group = parser.add_argument_group("metrics")
+        metrics_group.add_argument(
+            '--enable-metrics', dest="enable_metrics", action="store_true",
+            help="Enable collection and rendering of performance metrics"
+        )
-- 
cgit 1.5.1


From b98b4c135d9738d5cf701712fc244209651cddf7 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Thu, 12 Mar 2015 16:05:46 +0000
Subject: Option to serve metrics from their own localhost-only TCP port
 instead of muxed on the main listener

---
 synapse/app/homeserver.py | 12 ++++++++++--
 synapse/config/metrics.py |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'synapse/config')

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2ba701f53f..aa7c722efc 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -129,7 +129,8 @@ class SynapseHomeServer(HomeServer):
             location of the web client. This does nothing if web_client is not
             True.
         """
-        web_client = self.get_config().webclient
+        config = self.get_config()
+        web_client = config.webclient
 
         # list containing (path_str, Resource) e.g:
         # [ ("/aaa/bbb/cc", Resource1), ("/aaa/dummy", Resource2) ]
@@ -155,7 +156,7 @@ class SynapseHomeServer(HomeServer):
             self.root_resource = Resource()
 
         metrics_resource = self.get_resource_for_metrics()
-        if metrics_resource is not None:
+        if config.metrics_port is None and metrics_resource is not None:
             desired_tree.append((METRICS_PREFIX, metrics_resource))
 
         # ideally we'd just use getChild and putChild but getChild doesn't work
@@ -234,6 +235,13 @@ class SynapseHomeServer(HomeServer):
             )
             logger.info("Synapse now listening on port %d", config.unsecure_port)
 
+        metrics_resource = self.get_resource_for_metrics()
+        if metrics_resource and config.metrics_port is not None:
+            reactor.listenTCP(
+                config.metrics_port, Site(metrics_resource), interface="127.0.0.1",
+            )
+            logger.info("Metrics now running on 127.0.0.1 port %d", config.metrics_port)
+
 
 def get_version_string():
     try:
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py
index 90aba10bba..901a429c76 100644
--- a/synapse/config/metrics.py
+++ b/synapse/config/metrics.py
@@ -20,6 +20,7 @@ class MetricsConfig(Config):
     def __init__(self, args):
         super(MetricsConfig, self).__init__(args)
         self.enable_metrics = args.enable_metrics
+        self.metrics_port = args.metrics_port
 
     @classmethod
     def add_arguments(cls, parser):
@@ -29,3 +30,7 @@ class MetricsConfig(Config):
             '--enable-metrics', dest="enable_metrics", action="store_true",
             help="Enable collection and rendering of performance metrics"
         )
+        metrics_group.add_argument(
+            '--metrics-port', metavar="PORT", type=int,
+            help="Separate port to accept metrics requests on (on localhost)"
+        )
-- 
cgit 1.5.1