matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-18 05:42:00 +03:00
Code Activity

Merge pull request #36 from matrix-org/kegan/event-stream-js-errors

Browse Source 
Wrap /events response processing in a try/catch
This commit is contained in:
Kegsay
2015-11-02 17:13:17 +00:00
parent 48253f0ff0 93a091c7e8
commit c1160d3419
1 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/client.js
View File

@@ -2066,6 +2066,7 @@ function _pollForEvents(client) {
else { else {
clearTimeout(timeoutObj); clearTimeout(timeoutObj);
} }
try {
var events = []; var events = [];
if (data) { if (data) {
events = utils.map(data.chunk, _PojoToMatrixEventMapper(self)); events = utils.map(data.chunk, _PojoToMatrixEventMapper(self));
@@ -2146,6 +2147,11 @@ function _pollForEvents(client) {
self.emit("event", e); self.emit("event", e);
}); });
} }
}
catch (e) {
console.error("Event stream error:");
console.error(e);
}
_pollForEvents(self); _pollForEvents(self);
}, function(err) { }, function(err) {
console.error("/events error: %s", JSON.stringify(err)); console.error("/events error: %s", JSON.stringify(err));