Merge remote-tracking branch 'origin/develop' into shhs

1 files changed, 6 insertions, 6 deletions

diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py
index 8aee14a8a8..eaf0aaa86e 100644
--- a/synapse/metrics/__init__.py
+++ b/synapse/metrics/__init__.py
@@ -231,10 +231,7 @@ class BucketCollector(object):
         res.append(["+Inf", sum(data.values())])
 
         metric = HistogramMetricFamily(
-            self.name,
-            "",
-            buckets=res,
-            sum_value=sum([x * y for x, y in data.items()]),
+            self.name, "", buckets=res, sum_value=sum([x * y for x, y in data.items()])
         )
         yield metric
 
@@ -263,7 +260,7 @@ class CPUMetrics(object):
         ticks_per_sec = 100
         try:
             # Try and get the system config
-            ticks_per_sec = os.sysconf('SC_CLK_TCK')
+            ticks_per_sec = os.sysconf("SC_CLK_TCK")
         except (ValueError, TypeError, AttributeError):
             pass
 
@@ -440,7 +437,10 @@ def runUntilCurrentTimer(func):
         counts = gc.get_count()
         for i in (2, 1, 0):
             if threshold[i] < counts[i]:
-                logger.info("Collecting gc %d", i)
+                if i == 0:
+                    logger.debug("Collecting gc %d", i)
+                else:
+                    logger.info("Collecting gc %d", i)
 
                 start = time.time()
                 unreachable = gc.collect(i)