diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-18 15:53:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-18 15:53:40 +0100 |
| commit | b4a1f2ccb58d6e17372dca310b627364d9792684 (patch) | |
| tree | 4cbb906a7c33a810b5da2b9e2c60eac6d5738d6f /synapse/rest/events.py | |
| parent | Add two different columns for ordering the events table, one which can be use... (diff) | |
| parent | Update the default longpoll timeout time. (diff) | |
| download | synapse-b4a1f2ccb58d6e17372dca310b627364d9792684.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'synapse/rest/events.py')
| -rw-r--r-- | synapse/rest/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py index dc811b813a..ca2f6978e5 100644 --- a/synapse/rest/events.py +++ b/synapse/rest/events.py @@ -24,7 +24,7 @@ from synapse.rest.base import RestServlet, client_path_pattern class EventStreamRestServlet(RestServlet): PATTERN = client_path_pattern("/events$") - DEFAULT_LONGPOLL_TIME_MS = 5000 + DEFAULT_LONGPOLL_TIME_MS = 30000 @defer.inlineCallbacks def on_GET(self, request): |