jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include new database corruption check for SQL errors

This commit is contained in:
Scott Nonnenberg 2021-06-30 15:06:50 -07:00 committed by GitHub
parent 759ced3417
commit 3b444479c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ts/sql/Client.ts
View File

@ -415,9 +415,14 @@ function _updateJob(id: number, data: ClientJobUpdateType) {
`SQL channel job ${id} (${fnName}) failed in ${end - start}ms`
);
if (error && error.message && error.message.includes('SQLITE_CORRUPT')) {
if (
error &&
error.message &&
(error.message.includes('SQLITE_CORRUPT') ||
error.message.includes('database disk image is malformed'))
) {
window.log.error(
'Detected SQLITE_CORRUPT error; restarting the application immediately'
`Detected corruption. Restarting the application immediately. Error: ${error.message}`
);
window.restart();
}

4
yarn.lock
View File

@ -15754,10 +15754,6 @@ rimraf@^3.0.2, rimraf@~3.0.2:
dependencies:
glob "^7.1.3"
"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#0956fdc542cb7d1a0f3a06f28b8966adf359bb61":
version "2.10.6"
resolved "https://github.com/signalapp/signal-ringrtc-node.git#0956fdc542cb7d1a0f3a06f28b8966adf359bb61"
"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#868f7ecb699b984171b5ad02f9b043bfa55ad804":
version "2.10.6"
resolved "https://github.com/signalapp/signal-ringrtc-node.git#868f7ecb699b984171b5ad02f9b043bfa55ad804"