gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove clearAll from consume(): we want duplicate logs on multiple reports

This commit is contained in:
Kegan Dougal 2017-01-20 13:02:57 +00:00
parent ba1e166ac8
commit 41c6294be2
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/vector/rageshake.js
View File

@ -180,17 +180,12 @@ class IndexedDBLogStore {
* returned are deleted at the same time, so this can be called at startup * returned are deleted at the same time, so this can be called at startup
* to do house-keeping to keep the logs from growing too large. * to do house-keeping to keep the logs from growing too large.
* *
* @param {boolean} clearAll True to clear the most recent logs returned in
* addition to the older logs. This is desirable when sending bug reports as
* we do not want to submit the same logs twice. This is not desirable when
* doing house-keeping at startup in case they want to submit a bug report
* later.
* @return {Promise<Object[]>} Resolves to an array of objects. The array is * @return {Promise<Object[]>} Resolves to an array of objects. The array is
* sorted in time (oldest first) based on when the log file was created (the * sorted in time (oldest first) based on when the log file was created (the
* log ID). The objects have said log ID in an "id" field and "lines" which * log ID). The objects have said log ID in an "id" field and "lines" which
* is a big string with all the new-line delimited logs. * is a big string with all the new-line delimited logs.
*/ */
async consume(clearAll) { async consume() {
const MAX_LOG_SIZE = 1024 * 1024 * 50; // 50 MB const MAX_LOG_SIZE = 1024 * 1024 * 50; // 50 MB
const db = this.db; const db = this.db;
@ -277,9 +272,6 @@ class IndexedDBLogStore {
break; break;
} }
} }
if (clearAll) {
removeLogIds = allLogIds;
}
if (removeLogIds.length > 0) { if (removeLogIds.length > 0) {
console.log("Removing logs: ", removeLogIds); console.log("Removing logs: ", removeLogIds);
// Don't await this because it's non-fatal if we can't clean up // Don't await this because it's non-fatal if we can't clean up
@ -378,7 +370,7 @@ module.exports = {
if (!store) { if (!store) {
return; return;
} }
await store.consume(false); await store.consume();
}, },
setBugReportEndpoint: function(url) { setBugReportEndpoint: function(url) {
@ -415,7 +407,7 @@ module.exports = {
// sending to work going off the in-memory console logs. // sending to work going off the in-memory console logs.
let logs = []; let logs = [];
if (store) { if (store) {
logs = await store.consume(true); logs = await store.consume();
} }
// and add the most recent console logs which won't be in the store yet. // and add the most recent console logs which won't be in the store yet.
const consoleLogs = logger.flush(); // remove logs from console const consoleLogs = logger.flush(); // remove logs from console