Bug 1317587 - don't start scheduled sync after shutdown. r=rnewman

MozReview-Commit-ID: GSyWAUa1qyr

--HG--
extra : rebase_source : 45d0dfd5c686803f017230ab6152d0204a3d4c8e

services/common/async.js

@@ -112,7 +112,8 @@ this.Async = {
   },
 
   /**
-   * Check if the app is still ready (not quitting).
+   * Check if the app is still ready (not quitting). Returns true, or throws an
+   * exception if not ready.
    */
   checkAppReady: function checkAppReady() {
     // Watch for app-quit notification to stop any sync calls
@@ -128,6 +129,21 @@ this.Async = {
     return (Async.checkAppReady = function() { return true; })();
   },
 
+  /**
+   * Check if the app is still ready (not quitting). Returns true if the app
+   * is ready, or false if it is being shut down.
+   */
+  isAppReady() {
+    try {
+      return Async.checkAppReady()
+    } catch (ex) {
+      if (!Async.isShutdownException(ex)) {
+        throw ex;
+      }
+    }
+    return false;
+  },
+
   /**
    * Check if the passed exception is one raised by checkAppReady. Typically
    * this will be used in exception handlers to allow such exceptions to

services/sync/modules/policies.js

@@ -401,6 +401,10 @@ SyncScheduler.prototype = {
       return;
     }
 
+    if (!Async.isAppReady()) {
+      this._log.debug("Not initiating sync: app is shutting down");
+      return;
+    }
     Utils.nextTick(this.service.sync, this.service);
   },