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

Don't run storage service concurrently with backup

Browse source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-11-05 21:07:20 -06:00 committed by GitHub
parent 2a71bb84be
commit be66aa0091
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ts/background.ts
View file

@ -403,6 +403,8 @@ export async function startApp(): Promise<void> {
accountManager = new window.textsecure.AccountManager(server);
accountManager.addEventListener('startRegistration', () => {
pauseProcessing();
backupReady.reject(new Error('startRegistration'));
backupReady = explodePromise();
});
@ -741,9 +743,7 @@ export async function startApp(): Promise<void> {
'WebAPI should be initialized together with MessageReceiver'
);
log.info('background/shutdown: shutting down messageReceiver');
server.unregisterRequestHandler(messageReceiver);
StorageService.disableStorageService();
messageReceiver.stopProcessing();
pauseProcessing();
await window.waitForAllBatchers();
}
@ -1143,6 +1143,18 @@ export async function startApp(): Promise<void> {
log.info('Storage fetch');
drop(window.storage.fetch());
function pauseProcessing() {
strictAssert(server != null, 'WebAPI not initialized');
strictAssert(
messageReceiver != null,
'messageReceiver must be initialized'
);
StorageService.disableStorageService();
server.unregisterRequestHandler(messageReceiver);
messageReceiver.stopProcessing();
}
function setupAppState() {
initializeRedux(getParametersForRedux());
@ -1623,6 +1635,9 @@ export async function startApp(): Promise<void> {
server.registerRequestHandler(messageReceiver);
drop(runStorageService({ reason: 'afterStart' }));
// Opposite of `messageReceiver.stopProcessing`
messageReceiver.reset();
}
window.getSyncRequest = (timeoutMillis?: number) => {
@ -3047,9 +3062,8 @@ export async function startApp(): Promise<void> {
if (messageReceiver) {
log.info('unlinkAndDisconnect: logging out');
strictAssert(server !== undefined, 'WebAPI not initialized');
server.unregisterRequestHandler(messageReceiver);
StorageService.disableStorageService();
messageReceiver.stopProcessing();
pauseProcessing();
backupReady.reject(new Error('Aborted'));
backupReady = explodePromise();