PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Only limit the rageshake log size in one place

Browse source 
We had two different places in the code that were both trying to
limit to the MAX_LOG_SIZE and doing different things with it.
fetchLogs was keeping each individual file to MAX_LOG_SIZE but then
the outer loop was also discarding the whole file if it would make
the total exceed MAX_LOG_SIZE. This meant that if you ran your client
for a while then refreshed and sent a rageshake, the logic would
omit everything from before the refresh but make sure it included the
tiny amount of useless logging from after the refresh.

This will truncate large files if they would take the whole thing
over the size limit and still include part of them.
This commit is contained in:
David Baker 2019-10-04 14:56:46 +01:00
parent dc9018dc11
commit a15c8fd476
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/rageshake/rageshake.js
View file

@ -254,7 +254,8 @@ class IndexedDBLogStore {
const db = this.db;
// Returns: a string representing the concatenated logs for this ID.
function fetchLogs(id) {
// Stops adding log fragments when the size exceeds maxSize
function fetchLogs(id, maxSize) {
const objectStore = db.transaction("logs", "readonly").objectStore("logs");
return new Promise((resolve, reject) => {
@ -269,10 +270,10 @@ class IndexedDBLogStore {
resolve(lines);
return; // end of results
}
if (lines.length + cursor.value.lines.length >= MAX_LOG_SIZE && lines.length > 0) {
lines = cursor.value.lines + lines;
if (lines.length >= maxSize) {
resolve(lines);
} else {
lines = cursor.value.lines + lines;
cursor.continue();
}
};
@ -336,22 +337,25 @@ class IndexedDBLogStore {
const logs = [];
let size = 0;
for (let i = 0; i < allLogIds.length; i++) {
const lines = await fetchLogs(allLogIds[i]);
const lines = await fetchLogs(allLogIds[i], MAX_LOG_SIZE - size);
// always include at least one log file, but only include
// subsequent ones if they won't take us over the MAX_LOG_SIZE
if (i > 0 && size + lines.length > MAX_LOG_SIZE) {
// always add the log file: fetchLogs will truncate once the maxSize we give it is
// exceeded, so we'll go over the max but only by one fragment's worth.
logs.push({
lines: lines,
id: allLogIds[i],
});
size += lines.length;
// If fetchLogs truncated we'll now be at or over the size limit,
// in which case we should stop and remove the rest of the log files.
if (size >= MAX_LOG_SIZE) {
// the remaining log IDs should be removed. If we go out of
// bounds this is just []
removeLogIds = allLogIds.slice(i + 1);
break;
}
logs.push({
lines: lines,
id: allLogIds[i],
});
size += lines.length;
}
if (removeLogIds.length > 0) {
console.log("Removing logs: ", removeLogIds);