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

Fix tightlooping when flush()ing without any logs 

The promise would resolve immediately, nulling out `flushPromise`. This would
then immediately be set from `new Promise((resolve, reject) => {...})` turning
it back into non-null `flushPromise`. The resolve handler was called so the
next `flush()` would see "oh yes, there is a non-null `flushPromise`" then
promptly try to set `flushAgainPromise` which chains off the resolved
`flushPromise` which relied on `flushPromise` being `null`ed out after
`resolve()`, causing the chained `flush()` to see "oh yes, there is a non-null
`flushPromise`" which... ad infinitum.

This PR fixes it by making the nulling out asynchronous but the fact it took
me this long to debug this issue indicates to me that this is a terrible piece
of code. Will re-write.
This commit is contained in:
Kegan Dougal 2017-01-23 17:37:57 +00:00
parent 2ecf65f057
commit f3df86872b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vector/rageshake.js
View File

@ -201,13 +201,11 @@ class IndexedDBLogStore {
if (!this.db) { if (!this.db) {
// not connected yet or user rejected access for us to r/w to // not connected yet or user rejected access for us to r/w to
// the db. // the db.
this.flushPromise = null;
reject(new Error("No connected database")); reject(new Error("No connected database"));
return; return;
} }
const lines = this.logger.flush(); const lines = this.logger.flush();
if (lines.length === 0) { if (lines.length === 0) {
this.flushPromise = null;
resolve(); resolve();
return; return;
} }
@ -217,18 +215,20 @@ class IndexedDBLogStore {
let lastModStore = txn.objectStore("logslastmod"); let lastModStore = txn.objectStore("logslastmod");
lastModStore.put(this._generateLastModifiedTime()); lastModStore.put(this._generateLastModifiedTime());
txn.oncomplete = (event) => { txn.oncomplete = (event) => {
this.flushPromise = null;
resolve(); resolve();
}; };
txn.onerror = (event) => { txn.onerror = (event) => {
console.error( console.error(
"Failed to flush logs : ", event "Failed to flush logs : ", event
); );
this.flushPromise = null;
reject( reject(
new Error("Failed to write logs: " + event.target.errorCode) new Error("Failed to write logs: " + event.target.errorCode)
); );
} }
}).then(() => {
this.flushPromise = null;
}, (err) => {
this.flushPromise = null;
}); });
return this.flushPromise; return this.flushPromise;
} }