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 812608 - Part 2b: More robust shutdown logic; r=rnewman

Browse Source
This commit is contained in:
Gregory Szorc 2013-01-06 13:53:33 -08:00
parent e79ef1a44f
commit d9d2473ac3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/healthreport/healthreporter.jsm
View File

@ -108,6 +108,7 @@ function HealthReporter(branch) {
this._storage = null;
this._storageInProgress = false;
this._collector = null;
this._collectorInProgress = false;
this._initialized = false;
this._initializeHadError = false;
this._initializedDeferred = Promise.defer();
@ -269,6 +270,7 @@ HealthReporter.prototype = Object.freeze({
this._log.info("Initializing collector.");
this._collector = new Metrics.Collector(this._storage);
this._collectorInProgress = true;
let catString = this._prefs.get("service.providerCategories") || "";
if (catString.length) {
@ -279,6 +281,9 @@ HealthReporter.prototype = Object.freeze({
},
_onCollectorInitialized: function () {
this._log.debug("Collector initialized.");
this._collectorInProgress = false;
if (this._shutdownRequested) {
this._initiateShutdown();
return;
@ -325,6 +330,11 @@ HealthReporter.prototype = Object.freeze({
// Safe to call multiple times.
this._policy.stopPolling();
if (this._collectorInProgress) {
this._log.warn("Collector is in progress of initializing. Waiting to finish.");
return;
}
// If storage is in the process of initializing, we need to wait for it
// to finish before continuing. The initialization process will call us
// again once storage has initialized.