summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 17:34:51 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 17:34:51 +0000
commiteae0842bc17b8af75bcb599866a5df8670fac754 (patch)
treea79e00280a48b6d56eae9c9ce6dee4448b4a119c /synapse/storage/_base.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentLog all the exits from _attempt_new_transaction (diff)
downloadsynapse-eae0842bc17b8af75bcb599866a5df8670fac754.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 36455ef93c..3e1ab0a159 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -84,7 +84,7 @@ class PerformanceCounters(object):
 
     def update(self, key, start_time, end_time=None):
         if end_time is None:
-            end_time = time.time() * 1000;
+            end_time = time.time() * 1000
         duration = end_time - start_time
         count, cum_time = self.current_counters.get(key, (0, 0))
         count += 1
@@ -588,7 +588,7 @@ class SQLBaseStore(object):
             "LIMIT 1 "
         )
 
-        start_time = time.time() * 1000;
+        start_time = time.time() * 1000
 
         txn.execute(sql, (event_id,))
 
@@ -613,7 +613,7 @@ class SQLBaseStore(object):
     def _get_event_from_row_txn(self, txn, internal_metadata, js, redacted,
                                 check_redacted=True, get_prev_content=False):
 
-        start_time = time.time() * 1000;
+        start_time = time.time() * 1000
         update_counter = self._get_event_counters.update
 
         d = json.loads(js)