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 /webclient | |
| 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 'webclient')
| -rw-r--r-- | webclient/components/matrix/event-stream-service.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js index 9f678e8454..c94cf0fe72 100644 --- a/webclient/components/matrix/event-stream-service.js +++ b/webclient/components/matrix/event-stream-service.js @@ -26,7 +26,7 @@ angular.module('eventStreamService', []) .factory('eventStreamService', ['$q', '$timeout', 'matrixService', 'eventHandlerService', function($q, $timeout, matrixService, eventHandlerService) { var END = "END"; var START = "START"; - var TIMEOUT_MS = 5000; + var TIMEOUT_MS = 30000; var ERR_TIMEOUT_MS = 5000; var settings = { |