wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1017706 - Better logging for FHR AsyncShutdown. r=rnewman

Browse Source
This commit is contained in:
David Rajchenbach-Teller 2014-06-02 04:28:00 +02:00
parent 1faa35f3af
commit a3958bc9b2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/healthreport/healthreporter.jsm
View File

@ -402,7 +402,18 @@ AbstractHealthReporter.prototype = Object.freeze({
// The database needs to be shut down by the end of shutdown
// phase profileBeforeChange.
Metrics.Storage.shutdown.addBlocker("FHR: Flushing storage shutdown",
this._promiseShutdown);
this._promiseShutdown,
() => ({
shutdownInitiated: this._shutdownInitiated,
initialized: this._initialized,
shutdownRequested: this._shutdownRequested,
initializeHadError: this._initializeHadError,
providerManagerInProgress: this._providerManagerInProgress,
storageInProgress: this._storageInProgress,
hasProviderManager: !!this._providerManager,
hasStorage: !!this._storage,
shutdownComplete: this.shutdownComplete
}));
try {
this._storageInProgress = true;
@ -571,7 +582,7 @@ AbstractHealthReporter.prototype = Object.freeze({
if (this._initializeHadError) {
this._log.warn("Initialization had error. Shutting down immediately.");
} else {
if (this._providerManagerInProcess) {
if (this._providerManagerInProgress) {
this._log.warn("Provider manager is in progress of initializing. " +
"Waiting to finish.");
return;