gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3644 from vector-im/rav/fix_rageshake_race 

rageshake: fix race when collecting logs
This commit is contained in:
Richard van der Hoff 2017-04-18 15:53:41 +01:00 committed by GitHub
parent 9fd379c97c 6fd6ea9b8e
commit fa132d3945
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vector/rageshake.js
View File

@ -205,9 +205,6 @@ class IndexedDBLogStore {
} }
let txn = this.db.transaction(["logs", "logslastmod"], "readwrite"); let txn = this.db.transaction(["logs", "logslastmod"], "readwrite");
let objStore = txn.objectStore("logs"); let objStore = txn.objectStore("logs");
objStore.add(this._generateLogEntry(lines));
let lastModStore = txn.objectStore("logslastmod");
lastModStore.put(this._generateLastModifiedTime());
txn.oncomplete = (event) => { txn.oncomplete = (event) => {
resolve(); resolve();
}; };
@ -219,6 +216,9 @@ class IndexedDBLogStore {
new Error("Failed to write logs: " + event.target.errorCode) new Error("Failed to write logs: " + event.target.errorCode)
); );
} }
objStore.add(this._generateLogEntry(lines));
let lastModStore = txn.objectStore("logslastmod");
lastModStore.put(this._generateLastModifiedTime());
}); });
return this.flushPromise; return this.flushPromise;
} }