Skip to content

fix: race condition preventing app to fully close on linux #1674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2025
Merged

fix: race condition preventing app to fully close on linux #1674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ts/data/dataInit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,13 @@ function removeJob(id: number) {
}

function makeJob(fnName: string) {
if (_shuttingDown && fnName !== 'close') {
if (_shuttingDown && fnName !== 'close' && fnName !== 'removeDB') {
throw new Error(`Rejecting SQL channel job (${fnName}); application is shutting down`);
}
if (!_shuttingDown && fnName === 'close') {
window?.log?.debug(`SQL channel job close() called, marking as shutting down`);
_shuttingDown = true;
}

_jobCounter += 1;
const id = _jobCounter;
Expand Down
2 changes: 1 addition & 1 deletion ts/node/sqlInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function closeDbInstance() {
}
const dbRef = globalInstance;
globalInstance = null;
// SQLLite documentation suggests that we run `PRAGMA optimize` right before
// SQlite documentation suggests that we run `PRAGMA optimize` right before
// closing the database connection.
dbRef.pragma('optimize');
dbRef.close();
Expand Down
Loading