diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 5957f938a4..e91fcc9789 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -510,7 +510,7 @@ def prepare_database(db_conn):
"new for the server to understand"
)
elif user_version < SCHEMA_VERSION:
- logging.info(
+ logger.info(
"Upgrading database from version %d",
user_version
)
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 5d4be09a82..fd5b2affad 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -57,7 +57,7 @@ class LoggingTransaction(object):
if args and args[0]:
values = args[0]
sql_logger.debug(
- "[SQL values] {%s} " + ", ".join(("<%s>",) * len(values)),
+ "[SQL values] {%s} " + ", ".join(("<%r>",) * len(values)),
self.name,
*values
)
@@ -91,6 +91,7 @@ class SQLBaseStore(object):
def runInteraction(self, desc, func, *args, **kwargs):
"""Wraps the .runInteraction() method on the underlying db_pool."""
current_context = LoggingContext.current_context()
+
def inner_func(txn, *args, **kwargs):
with LoggingContext("runInteraction") as context:
current_context.copy_to(context)
@@ -115,7 +116,6 @@ class SQLBaseStore(object):
"[TXN END] {%s} %f",
name, end - start
)
-
with PreserveLoggingContext():
result = yield self._db_pool.runInteraction(
inner_func, *args, **kwargs
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 1f89d77344..4d15005c9e 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -75,7 +75,9 @@ class RegistrationStore(SQLBaseStore):
"VALUES (?,?,?)",
[user_id, password_hash, now])
except IntegrityError:
- raise StoreError(400, "User ID already taken.", errcode=Codes.USER_IN_USE)
+ raise StoreError(
+ 400, "User ID already taken.", errcode=Codes.USER_IN_USE
+ )
# it's possible for this to get a conflict, but only for a single user
# since tokens are namespaced based on their user ID
@@ -83,8 +85,8 @@ class RegistrationStore(SQLBaseStore):
"VALUES (?,?)", [txn.lastrowid, token])
def get_user_by_id(self, user_id):
- query = ("SELECT users.name, users.password_hash FROM users "
- "WHERE users.name = ?")
+ query = ("SELECT users.name, users.password_hash FROM users"
+ " WHERE users.name = ?")
return self._execute(
self.cursor_to_dict,
query, user_id
@@ -120,10 +122,10 @@ class RegistrationStore(SQLBaseStore):
def _query_for_auth(self, txn, token):
sql = (
- "SELECT users.name, users.admin, access_tokens.device_id "
- "FROM users "
- "INNER JOIN access_tokens on users.id = access_tokens.user_id "
- "WHERE token = ?"
+ "SELECT users.name, users.admin, access_tokens.device_id"
+ " FROM users"
+ " INNER JOIN access_tokens on users.id = access_tokens.user_id"
+ " WHERE token = ?"
)
cursor = txn.execute(sql, (token,))
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index cc0513b8d2..2378d65943 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -27,7 +27,9 @@ import logging
logger = logging.getLogger(__name__)
-OpsLevel = collections.namedtuple("OpsLevel", ("ban_level", "kick_level", "redact_level"))
+OpsLevel = collections.namedtuple("OpsLevel", (
+ "ban_level", "kick_level", "redact_level")
+)
class RoomStore(SQLBaseStore):
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 93329703a2..c37df59d45 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -177,8 +177,8 @@ class RoomMemberStore(SQLBaseStore):
return self._get_members_query(clause, vals)
def _get_members_query(self, where_clause, where_values):
- return self._db_pool.runInteraction(
- self._get_members_query_txn,
+ return self.runInteraction(
+ "get_members_query", self._get_members_query_txn,
where_clause, where_values
)
diff --git a/synapse/storage/signatures.py b/synapse/storage/signatures.py
index d90e08fff1..eea4f21065 100644
--- a/synapse/storage/signatures.py
+++ b/synapse/storage/signatures.py
@@ -36,7 +36,7 @@ class SignatureStore(SQLBaseStore):
return dict(txn.fetchall())
def _store_event_content_hash_txn(self, txn, event_id, algorithm,
- hash_bytes):
+ hash_bytes):
"""Store a hash for a Event
Args:
txn (cursor):
@@ -84,7 +84,7 @@ class SignatureStore(SQLBaseStore):
return dict(txn.fetchall())
def _store_event_reference_hash_txn(self, txn, event_id, algorithm,
- hash_bytes):
+ hash_bytes):
"""Store a hash for a PDU
Args:
txn (cursor):
@@ -127,7 +127,7 @@ class SignatureStore(SQLBaseStore):
return res
def _store_event_signature_txn(self, txn, event_id, signature_name, key_id,
- signature_bytes):
+ signature_bytes):
"""Store a signature from the origin server for a PDU.
Args:
txn (cursor):
@@ -169,7 +169,7 @@ class SignatureStore(SQLBaseStore):
return results
def _store_prev_event_hash_txn(self, txn, event_id, prev_event_id,
- algorithm, hash_bytes):
+ algorithm, hash_bytes):
self._simple_insert_txn(
txn,
"event_edge_hashes",
@@ -180,4 +180,4 @@ class SignatureStore(SQLBaseStore):
"hash": buffer(hash_bytes),
},
or_ignore=True,
- )
\ No newline at end of file
+ )
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index a954024678..b84735e61c 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -213,8 +213,8 @@ class StreamStore(SQLBaseStore):
# Tokens really represent positions between elements, but we use
# the convention of pointing to the event before the gap. Hence
# we have a bit of asymmetry when it comes to equalities.
- from_comp = '<=' if direction =='b' else '>'
- to_comp = '>' if direction =='b' else '<='
+ from_comp = '<=' if direction == 'b' else '>'
+ to_comp = '>' if direction == 'b' else '<='
order = "DESC" if direction == 'b' else "ASC"
args = [room_id]
@@ -235,9 +235,10 @@ class StreamStore(SQLBaseStore):
)
sql = (
- "SELECT *, (%(redacted)s) AS redacted FROM events "
- "WHERE outlier = 0 AND room_id = ? AND %(bounds)s "
- "ORDER BY topological_ordering %(order)s, stream_ordering %(order)s %(limit)s "
+ "SELECT *, (%(redacted)s) AS redacted FROM events"
+ " WHERE outlier = 0 AND room_id = ? AND %(bounds)s"
+ " ORDER BY topological_ordering %(order)s,"
+ " stream_ordering %(order)s %(limit)s"
) % {
"redacted": del_sql,
"bounds": bounds,
|
