diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py
index add1e3879c..8a3a6a880f 100644
--- a/synapse/appservice/scheduler.py
+++ b/synapse/appservice/scheduler.py
@@ -86,7 +86,7 @@ class AppServiceScheduler(object):
self.txn_ctrl.start_polling()
def submit_event_for_as(self, service, event):
- self.event_grouper.on_receive(service, event)
+ self.event_grouper.enqueue(service, event)
class _EventGrouper(object):
@@ -96,7 +96,7 @@ class _EventGrouper(object):
def __init__(self):
self.groups = {} # dict of {service: [events]}
- def on_receive(self, service, event):
+ def enqueue(self, service, event):
if service not in self.groups:
self.groups[service] = []
self.groups[service].append(event)
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index f3cd458e6b..a24f7f5587 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -27,8 +27,14 @@ logger = logging.getLogger(__name__)
def log_failure(failure):
- logger.error("Application Services Failure: %s", failure.value)
- logger.error(failure.getTraceback())
+ logger.error(
+ "Application Services Failure",
+ exc_info=(
+ failure.type,
+ failure.value,
+ failure.getTracebackObject()
+ )
+ )
# NB: Purposefully not inheriting BaseHandler since that contains way too much
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index efef859214..e752b035e6 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -82,7 +82,7 @@ class DataStore(RoomMemberStore, RoomStore,
FilteringStore,
PusherStore,
PushRuleStore,
- ApplicationServiceTransactionStore
+ ApplicationServiceTransactionStore,
):
def __init__(self, hs):
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index 670e1d56af..e928812bc9 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -365,9 +365,9 @@ class ApplicationServiceTransactionStore(SQLBaseStore):
may be empty.
"""
sql = (
- "SELECT r.*, a.* FROM application_services_state AS s LEFT JOIN "
- "application_services AS a ON a.id=s.as_id LEFT JOIN "
- "application_services_regex AS r ON r.as_id=a.id WHERE state = ?"
+ "SELECT r.*, a.* FROM application_services_state AS s LEFT JOIN"
+ " application_services AS a ON a.id=s.as_id LEFT JOIN"
+ " application_services_regex AS r ON r.as_id=a.id WHERE state = ?"
)
results = yield self._execute_and_decode(
"get_appservices_by_state", sql, state
|
