diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 1c466cbded..963d938edd 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -233,16 +233,10 @@ class TransactionQueue(object):
consumeErrors=True
))
- events_processed_counter.inc_by(len(events))
-
yield self.store.update_federation_out_pos(
"events", next_token
)
- synapse.metrics.event_processing_positions.set(
- next_token, "federation_sender",
- )
-
if events:
now = self.clock.time_msec()
ts = yield self.store.get_received_ts(events[-1].event_id)
@@ -254,6 +248,12 @@ class TransactionQueue(object):
ts, "federation_sender",
)
+ events_processed_counter.inc_by(len(events))
+
+ synapse.metrics.event_processing_positions.set(
+ next_token, "federation_sender",
+ )
+
finally:
self._is_processing = False
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index fcc1246bee..ce0814bc25 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -108,16 +108,16 @@ class ApplicationServicesHandler(object):
service, event
)
- events_processed_counter.inc_by(len(events))
-
yield self.store.set_appservice_last_pos(upper_bound)
+ now = self.clock.time_msec()
+ ts = yield self.store.get_received_ts(events[-1].event_id)
+
synapse.metrics.event_processing_positions.set(
upper_bound, "appservice_sender",
)
- now = self.clock.time_msec()
- ts = yield self.store.get_received_ts(events[-1].event_id)
+ events_processed_counter.inc_by(len(events))
synapse.metrics.event_processing_lag.set(
now - ts, "appservice_sender",
|
