diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-26 15:45:03 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-26 15:45:03 +0100 |
commit | ff3709e5775aee6e0f2d8cb52eb7138af9babae4 (patch) | |
tree | f35b59e54908a4644748489f6c1aa524221d8f2e /synapse/rest/base.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
parent | Determine and send user presence state (diff) | |
download | synapse-ff3709e5775aee6e0f2d8cb52eb7138af9babae4.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/rest/base.py')
-rw-r--r-- | synapse/rest/base.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/base.py b/synapse/rest/base.py index 6a88cbe866..e855d293e5 100644 --- a/synapse/rest/base.py +++ b/synapse/rest/base.py @@ -15,6 +15,7 @@ """ This module contains base REST classes for constructing REST servlets. """ from synapse.api.urls import CLIENT_PREFIX +from synapse.rest.transactions import HttpTransactionStore import re @@ -59,6 +60,7 @@ class RestServlet(object): self.handlers = hs.get_handlers() self.event_factory = hs.get_event_factory() self.auth = hs.get_auth() + self.txns = HttpTransactionStore() def register(self, http_server): """ Register this servlet with the given HTTP server. """ |