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 1110691 - Submit which health reporter provider is currently shutting down on AsyncShutdownTimeout. r=yoric

Browse Source
This commit is contained in:
Georg Fritzsche 2014-12-12 14:50:07 +01:00
parent 04a666e08c
commit e2867814f2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/healthreport/healthreporter.jsm
View File

@ -337,6 +337,10 @@ function AbstractHealthReporter(branch, policy, sessionRecorder) {
let hasFirstRun = this._prefs.get("service.firstRun", false);
this._initHistogram = hasFirstRun ? TELEMETRY_INIT : TELEMETRY_INIT_FIRSTRUN;
this._dbOpenHistogram = hasFirstRun ? TELEMETRY_DB_OPEN : TELEMETRY_DB_OPEN_FIRSTRUN;
// This is set to the name of the provider that we are currently shutting down, if any.
// It is used for AsyncShutdownTimeout diagnostics.
this._currentProviderInShutdown = null;
}
AbstractHealthReporter.prototype = Object.freeze({
@ -407,7 +411,8 @@ AbstractHealthReporter.prototype = Object.freeze({
storageInProgress: this._storageInProgress,
hasProviderManager: !!this._providerManager,
hasStorage: !!this._storage,
shutdownComplete: this._shutdownComplete
shutdownComplete: this._shutdownComplete,
currentProviderInShutdown: this._currentProviderInShutdown,
}));
try {
@ -612,6 +617,8 @@ AbstractHealthReporter.prototype = Object.freeze({
this._log.info("Shutting down provider manager.");
for (let provider of this._providerManager.providers) {
try {
this._log.info("Shutting down provider: " + provider.name);
this._currentProviderInShutdown = provider.name;
yield provider.shutdown();
} catch (ex) {
this._log.warn("Error when shutting down provider: " +
@ -620,6 +627,7 @@ AbstractHealthReporter.prototype = Object.freeze({
}
this._log.info("Provider manager shut down.");
this._providerManager = null;
this._currentProviderInShutdown = null;
this._onProviderManagerShutdown();
}
if (this._storage) {