Skip to content

Standardize shutdown checking logic #1776

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 3 commits into from
May 9, 2019
Merged

Standardize shutdown checking logic #1776

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dba7689
Standardize shutdown check logic
May 9, 2019
921ae43
standardize logic blocks across sdks
May 9, 2019
d52848a
unable to justify that 'strictness really is required'
May 9, 2019
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
29 changes: 14 additions & 15 deletions packages/firestore/src/core/firestore_client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,23 +495,22 @@ export class FirestoreClient {
}

shutdown(): Promise<void> {
if (this.isShutdown === true) {
return Promise.resolve();
}
return this.asyncQueue.enqueue(async () => {
// PORTING NOTE: LocalStore does not need an explicit shutdown on web.
if (this.lruScheduler) {
this.lruScheduler.stop();
if (!this.isShutdown) {
// PORTING NOTE: LocalStore does not need an explicit shutdown on web.
if (this.lruScheduler) {
this.lruScheduler.stop();
}
await this.remoteStore.shutdown();
await this.sharedClientState.shutdown();
await this.persistence.shutdown();

// `removeChangeListener` must be called after shutting down the
// RemoteStore as it will prevent the RemoteStore from retrieving
// auth tokens.
this.credentials.removeChangeListener();
this.isShutdown = true;
}
await this.remoteStore.shutdown();
await this.sharedClientState.shutdown();
await this.persistence.shutdown();

// `removeChangeListener` must be called after shutting down the
// RemoteStore as it will prevent the RemoteStore from retrieving
// auth tokens.
this.credentials.removeChangeListener();
this.isShutdown = true;
});
}

Expand Down