summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-03 16:22:35 +0000
committerErik Johnston <erik@matrix.org>2016-02-03 16:22:35 +0000
commitb84d59c5f01914fe53d2673c5c7e372f5c61d088 (patch)
tree05ef68e94da6569320bcf4800f24fbc1ba419aca /synapse
parentPreserve log context over when deferring to thread pool in media repo (diff)
downloadsynapse-b84d59c5f01914fe53d2673c5c7e372f5c61d088.tar.xz
Add descriptions
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/appservice.py3
-rw-r--r--synapse/storage/keys.py1
-rw-r--r--synapse/storage/registration.py1
-rw-r--r--synapse/storage/stream.py1
4 files changed, 5 insertions, 1 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index b5aa55c0a3..1100c67714 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -276,7 +276,8 @@ class ApplicationServiceTransactionStore(SQLBaseStore):
             "application_services_state",
             dict(as_id=service.id),
             ["state"],
-            allow_none=True
+            allow_none=True,
+            desc="get_appservice_state",
         )
         if result:
             defer.returnValue(result.get("state"))
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index 8022b8cfc6..fd05bfe54e 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -39,6 +39,7 @@ class KeyStore(SQLBaseStore):
             table="server_tls_certificates",
             keyvalues={"server_name": server_name},
             retcols=("tls_certificate",),
+            desc="get_server_certificate",
         )
         tls_certificate = OpenSSL.crypto.load_certificate(
             OpenSSL.crypto.FILETYPE_ASN1, tls_certificate_bytes,
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index 70cde0d04d..bd35e19be6 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -134,6 +134,7 @@ class RegistrationStore(SQLBaseStore):
             },
             retcols=["name", "password_hash", "is_guest"],
             allow_none=True,
+            desc="get_user_by_id",
         )
 
     def get_users_by_id_case_insensitive(self, user_id):
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 2c49a5e499..50436cb2d2 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -564,6 +564,7 @@ class StreamStore(SQLBaseStore):
             table="events",
             keyvalues={"event_id": event_id},
             retcols=("stream_ordering", "topological_ordering"),
+            desc="get_topological_token_for_event",
         ).addCallback(lambda row: "t%d-%d" % (
             row["topological_ordering"], row["stream_ordering"],)
         )