From a3958bc9b26ee6d8898177d10e0f522e12e4e1a3 Mon Sep 17 00:00:00 2001
From: David Rajchenbach-Teller <dteller@mozilla.com>
Date: Mon, 2 Jun 2014 04:28:00 +0200
Subject: [PATCH] Bug 1017706 - Better logging for FHR AsyncShutdown. r=rnewman

---
 services/healthreport/healthreporter.jsm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/services/healthreport/healthreporter.jsm b/services/healthreport/healthreporter.jsm
index 4d4b1074b01..f33bf4f3479 100644
--- a/services/healthreport/healthreporter.jsm
+++ b/services/healthreport/healthreporter.jsm
@@ -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;