mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move to e.target.error, transaction/request.error didn't work (#1785)

Browse source 
* Pull error properly from the indexeddb request

* Move to e.target.error, transaction/request.error didn't work
This commit is contained in:
Scott Nonnenberg 2017-11-21 15:24:04 -08:00 • committed by GitHub
parent 1c455c83e0
commit abb83a895e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

56
js/backup.js
View file

@ -101,7 +101,8 @@
_.each(storeNames, function(storeName) { _.each(storeNames, function(storeName) {
var transaction = idb_db.transaction(storeNames, 'readwrite'); var transaction = idb_db.transaction(storeNames, 'readwrite');
transaction.onerror = function(error) { transaction.onerror = function(e) {
var error = e.target.error;
console.log( console.log(
'exportToJsonFile: transaction error', 'exportToJsonFile: transaction error',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -116,8 +117,13 @@
var request = store.openCursor(); var request = store.openCursor();
var count = 0; var count = 0;
request.onerror = function(e) { request.onerror = function(e) {
console.log('Error attempting to export store', storeName); var error = e.target.error;
reject(e); console.log(
'Error attempting to export store',
storeName,
error && error.stack ? error.stack : error
);
reject(error);
}; };
request.onsuccess = function(event) { request.onsuccess = function(event) {
if (count === 0) { if (count === 0) {
@ -188,8 +194,8 @@
}; };
var transaction = idb_db.transaction(storeNames, 'readwrite'); var transaction = idb_db.transaction(storeNames, 'readwrite');
transaction.onerror = function() { transaction.onerror = function(e) {
var error = transaction.error; var error = e.target.error;
console.log( console.log(
'importFromJsonString error:', 'importFromJsonString error:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -223,8 +229,8 @@
} }
} }
}; };
request.onerror = function() { request.onerror = function(e) {
var error = request.error; var error = e.target.error;
console.log( console.log(
'Error adding object to store', 'Error adding object to store',
storeName, storeName,
@ -392,9 +398,8 @@
return createFileAndWriter(dir, 'messages.json').then(function(writer) { return createFileAndWriter(dir, 'messages.json').then(function(writer) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var transaction = idb_db.transaction('messages', 'readwrite'); var transaction = idb_db.transaction('messages', 'readwrite');
transaction.onerror = function() { transaction.onerror = function(e) {
var error = transaction.error; var error = e.target.error;
console.log( console.log(
'exportConversation transaction error for conversation', 'exportConversation transaction error for conversation',
name, name,
@ -418,9 +423,8 @@
var stream = createOutputStream(writer); var stream = createOutputStream(writer);
stream.write('{"messages":['); stream.write('{"messages":[');
request.onerror = function() { request.onerror = function(e) {
var error = request.error; var error = e.target.error;
console.log( console.log(
'exportConversation: error pulling messages for conversation', 'exportConversation: error pulling messages for conversation',
name, name,
@ -510,8 +514,8 @@
function exportConversations(idb_db, parentDir) { function exportConversations(idb_db, parentDir) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var transaction = idb_db.transaction('conversations', 'readwrite'); var transaction = idb_db.transaction('conversations', 'readwrite');
transaction.onerror = function() { transaction.onerror = function(e) {
var error = transaction.error; var error = e.target.error;
console.log( console.log(
'exportConversations: transaction error:', 'exportConversations: transaction error:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -525,8 +529,8 @@
var promiseChain = Promise.resolve(); var promiseChain = Promise.resolve();
var store = transaction.objectStore('conversations'); var store = transaction.objectStore('conversations');
var request = store.openCursor(); var request = store.openCursor();
request.onerror = function() { request.onerror = function(e) {
var error = request.error; var error = e.target.error;
console.log( console.log(
'exportConversations: error pulling conversations:', 'exportConversations: error pulling conversations:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -616,9 +620,8 @@
}; };
var transaction = idb_db.transaction('messages', 'readwrite'); var transaction = idb_db.transaction('messages', 'readwrite');
transaction.onerror = function() { transaction.onerror = function(e) {
var error = transaction.error; var error = e.target.error;
console.log( console.log(
'saveAllMessages transaction error:', 'saveAllMessages transaction error:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -646,8 +649,8 @@
finish('puts scheduled'); finish('puts scheduled');
} }
}; };
request.onerror = function() { request.onerror = function(e) {
var event = request.error; var error = e.target.error;
console.log( console.log(
'Error adding object to store:', 'Error adding object to store:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -744,8 +747,8 @@
}; };
transaction.oncomplete = finish.bind(null, 'transaction complete'); transaction.oncomplete = finish.bind(null, 'transaction complete');
transaction.onerror = function() { transaction.onerror = function(e) {
var error = transaction.error; var error = e.target.error;
console.log( console.log(
'saveAllMessages transaction error:', 'saveAllMessages transaction error:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error
@ -768,9 +771,8 @@
} }
}; };
request.onerror = function() { request.onerror = function(e) {
var error = request.error; var error = e.target.error;
console.log( console.log(
'clearAllStores transaction error:', 'clearAllStores transaction error:',
error && error.stack ? error.stack : error error && error.stack ? error.stack : error