summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-26 16:01:29 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-26 16:01:29 +0100
commit32347bfcc99b13454264bce3e4afe469a8f33026 (patch)
tree4a48eda1c8526052f1d0000a3518ef67b7ab4117 /synapse/storage
parentMove the event storage into a single transaction (diff)
downloadsynapse-32347bfcc99b13454264bce3e4afe469a8f33026.tar.xz
fix a few pyflakes errors
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py

index 30dc8a50cf..63afca9ad7 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py
@@ -69,7 +69,7 @@ class DataStore(RoomMemberStore, RoomStore, stream_ordering = self.min_token latest = yield self._db_pool.runInteraction( - _persist_event_txn, event, backfilled, stream_ordering + self._persist_event_txn, event, backfilled, stream_ordering ) defer.returnValue(latest) @@ -128,7 +128,7 @@ class DataStore(RoomMemberStore, RoomStore, except: logger.exception( "Failed to persist, probably duplicate: %s", - event_id + event.event_id ) return @@ -146,7 +146,7 @@ class DataStore(RoomMemberStore, RoomStore, self._simple_insert_txn(txn, "state_events", vals) self._simple_insert_txn( - txn + txn, "current_state_events", { "event_id": event.event_id,