web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into exportFolderTests

Browse Source
This commit is contained in:
ClemDee
2019-08-14 15:59:59 +02:00
parent f017215300 a327f4a0bf
commit 51241bda48
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/cryptget.js
View File

@@ -21,6 +21,11 @@ define([
S.leave(); S.leave();
} catch (e) { console.log(e); } } catch (e) { console.log(e); }
} }
if (S.session && S.session.stop) {
try {
S.session.stop();
} catch (e) { console.error(e); }
}
var abort = Util.find(S, ['session', 'realtime', 'abort']); var abort = Util.find(S, ['session', 'realtime', 'abort']);
if (typeof(abort) === 'function') { if (typeof(abort) === 'function') {
S.session.realtime.sync(); S.session.realtime.sync();

3
www/common/sframe-common-outer.js
View File

@@ -864,6 +864,9 @@ define([
Cryptpad.removeLoginBlock(data, cb); Cryptpad.removeLoginBlock(data, cb);
}); });
// It seems we have performance issues when we open and close a lot of channels over
// the same network, maybe a memory leak. To fix this, we kill and create a new
// network every 30 cryptget calls (1 call = 1 channel)
var cgNetwork; var cgNetwork;
var whenCGReady = function (cb) { var whenCGReady = function (cb) {
if (cgNetwork && cgNetwork !== true) { console.log(cgNetwork); return void cb(); } if (cgNetwork && cgNetwork !== true) { console.log(cgNetwork); return void cb(); }