diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-06-06 07:02:02 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-06-06 07:02:02 +0100 |
| commit | 592ee217a3d0622ace35743dd4bb48fe5560b3ac (patch) | |
| tree | 0bdf92e711d6d9e1fe52d653821c88bee834dbb1 | |
| parent | bump version and changelog (diff) | |
| parent | Fix replication metrics (diff) | |
| download | synapse-592ee217a3d0622ace35743dd4bb48fe5560b3ac.tar.xz | |
Merge commit 'b7e7fd2' into release-v0.31.0
| -rw-r--r-- | synapse/metrics/__init__.py | 9 | ||||
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py index 56c0032f91..429e79c472 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py @@ -60,10 +60,13 @@ class LaterGauge(object): try: calls = self.caller() - except Exception as e: - print(e) - logger.err() + except Exception: + logger.exception( + "Exception running callback for LaterGuage(%s)", + self.name, + ) yield g + return if isinstance(calls, dict): for k, v in calls.items(): diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index a6280aae70..c870475cd1 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -622,7 +622,7 @@ tcp_inbound_commands = LaterGauge( lambda: { (k[0], p.name, p.conn_id): count for p in connected_connections - for k, count in iteritems(p.inbound_commands_counter.counts) + for k, count in iteritems(p.inbound_commands_counter) }) tcp_outbound_commands = LaterGauge( @@ -630,7 +630,7 @@ tcp_outbound_commands = LaterGauge( lambda: { (k[0], p.name, p.conn_id): count for p in connected_connections - for k, count in iteritems(p.outbound_commands_counter.counts) + for k, count in iteritems(p.outbound_commands_counter) }) # number of updates received for each RDATA stream |