rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use observable deferreds because they are sane

This commit is contained in:
Kegan Dougal 2016-11-11 14:13:32 +00:00
parent 8a8ad46f48
commit c7daf3136c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/rest/client/v2_alpha/sendtodevice.py
View File

@ -20,6 +20,7 @@ from twisted.internet import defer
from synapse.http import servlet from synapse.http import servlet
from synapse.http.servlet import parse_json_object_from_request from synapse.http.servlet import parse_json_object_from_request
from synapse.rest.client.v1.transactions import HttpTransactionCache from synapse.rest.client.v1.transactions import HttpTransactionCache
from synapse.util.async import ObservableDeferred
from ._base import client_v2_patterns from ._base import client_v2_patterns
@ -47,14 +48,14 @@ class SendToDeviceRestServlet(servlet.RestServlet):
def on_PUT(self, request, message_type, txn_id): def on_PUT(self, request, message_type, txn_id):
try: try:
res_deferred = self.txns.get_client_transaction(request, txn_id) res_deferred = self.txns.get_client_transaction(request, txn_id)
res = yield res_deferred res = yield res_deferred.observe()
defer.returnValue(res) defer.returnValue(res)
except KeyError: except KeyError:
pass pass
res_deferred = self._put(request, message_type, txn_id) res_deferred = ObservableDeferred(self._put(request, message_type, txn_id))
self.txns.store_client_transaction(request, txn_id, res_deferred) self.txns.store_client_transaction(request, txn_id, res_deferred)
res = yield res_deferred res = yield res_deferred.observe()
defer.returnValue(res) defer.returnValue(res)
@defer.inlineCallbacks @defer.inlineCallbacks