MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-16 15:53:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge commit 'b7e7fd2' into release-v0.31.0

Browse source
This commit is contained in:
Richard van der Hoff 2018-06-06 07:02:02 +01:00
commit 592ee217a3
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/metrics/__init__.py
View file

@ -60,10 +60,13 @@ class LaterGauge(object):
try: try:
calls = self.caller() calls = self.caller()
except Exception as e: except Exception:
print(e) logger.exception(
logger.err() "Exception running callback for LaterGuage(%s)",
self.name,
)
yield g yield g
return
if isinstance(calls, dict): if isinstance(calls, dict):
for k, v in calls.items(): for k, v in calls.items():

4
synapse/replication/tcp/protocol.py
View file

@ -622,7 +622,7 @@ tcp_inbound_commands = LaterGauge(
lambda: { lambda: {
(k[0], p.name, p.conn_id): count (k[0], p.name, p.conn_id): count
for p in connected_connections 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( tcp_outbound_commands = LaterGauge(
@ -630,7 +630,7 @@ tcp_outbound_commands = LaterGauge(
lambda: { lambda: {
(k[0], p.name, p.conn_id): count (k[0], p.name, p.conn_id): count
for p in connected_connections 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 # number of updates received for each RDATA stream