summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-16 15:33:07 +0100
committerErik Johnston <erik@matrix.org>2017-05-16 15:33:07 +0100
commit331570ea6f97d570cf2774cd0700eb588e9fb1d7 (patch)
tree5427c59e91d8110c1c55db9c875a7ef690ef997d
parentTake a copy before prefilling, as it may be a frozendict (diff)
downloadsynapse-331570ea6f97d570cf2774cd0700eb588e9fb1d7.tar.xz
Remove spurious merge artifacts
Diffstat (limited to '')
-rw-r--r--synapse/storage/events.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 5db7ec1622..12dd74daa3 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -387,19 +387,6 @@ class EventsStore(SQLBaseStore):
 
                     event_counter.inc(event.type, origin_type, origin_entity)
 
-                for event, context in chunk:
-                    if context.app_service:
-                        origin_type = "local"
-                        origin_entity = context.app_service.id
-                    elif self.hs.is_mine_id(event.sender):
-                        origin_type = "local"
-                        origin_entity = "*client*"
-                    else:
-                        origin_type = "remote"
-                        origin_entity = get_domain_from_id(event.sender)
-
-                    event_counter.inc(event.type, origin_type, origin_entity)
-
                 for room_id, (_, _, new_state) in current_state_for_room.iteritems():
                     self.get_current_state_ids.prefill(
                         (room_id, ), new_state