diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
| commit | f9232c7917322de392921336b4bab5d85c213c4e (patch) | |
| tree | ab55547f1c895da508e6ac37c8056fef5b3b754e /synapse/storage/appservice.py | |
| parent | Fix remaining scheduler bugs. Add more informative logging. (diff) | |
| parent | add ToC and fix typoe (diff) | |
| download | synapse-f9232c7917322de392921336b4bab5d85c213c4e.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/appservice.py
Diffstat (limited to 'synapse/storage/appservice.py')
| -rw-r--r-- | synapse/storage/appservice.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py index c4b4f56c5d..670e1d56af 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py @@ -341,7 +341,7 @@ class ApplicationServiceStore(SQLBaseStore): sql = ("SELECT r.*, a.* FROM application_services AS a LEFT JOIN " "application_services_regex AS r ON a.id = r.as_id") - results = yield self._execute_and_decode(sql) + results = yield self._execute_and_decode("appservice_cache", sql) services = self._parse_services_dict(results) for service in services: @@ -369,7 +369,9 @@ class ApplicationServiceTransactionStore(SQLBaseStore): "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(sql, state) + results = yield self._execute_and_decode( + "get_appservices_by_state", sql, state + ) # NB: This assumes this class is linked with ApplicationServiceStore defer.returnValue(self._parse_services_dict(results)) |