Bug 1139548 - Fix Telemetry shutdown for short sessions. r=vladan
authorAlessio Placitelli <alessio.placitelli@gmail.com>
Thu, 05 Mar 2015 11:03:00 +0100
changeset 232506 a9e7d74b9f5bde74251f9a826868341b3729c177
parent 232505 b7dfd398210f927f6388efa4c47e92abb76b1462
child 232507 c5fc760d1401e861224b676bb58b2c8f8cef1862
push id28385
push userkwierso@gmail.com
push dateTue, 10 Mar 2015 00:38:43 +0000
treeherdermozilla-central@d164b59f3b94 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvladan
bugs1139548
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1139548 - Fix Telemetry shutdown for short sessions. r=vladan
toolkit/components/telemetry/TelemetryPing.jsm
toolkit/components/telemetry/TelemetrySession.jsm
--- a/toolkit/components/telemetry/TelemetryPing.jsm
+++ b/toolkit/components/telemetry/TelemetryPing.jsm
@@ -782,17 +782,16 @@ let Impl = {
 
     // This handles 4).
     if (!this._delayedInitTask) {
       // We already ran the delayed initialization.
       return cleanup();
     }
 
     // This handles 2) and 3).
-    this._delayedInitTask.disarm();
     return this._delayedInitTask.finalize().then(cleanup);
   },
 
   /**
    * This observer drives telemetry.
    */
   observe: function (aSubject, aTopic, aData) {
     // The logger might still be not available at this point.
--- a/toolkit/components/telemetry/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/TelemetrySession.jsm
@@ -1537,17 +1537,16 @@ let Impl = {
 
     // This handles 4).
     if (!this._delayedInitTask) {
       // We already ran the delayed initialization.
       return cleanup();
      }
 
     // This handles 2) and 3).
-    this._delayedInitTask.disarm();
     return this._delayedInitTask.finalize().then(cleanup);
    },
 
   _rescheduleDailyTimer: function() {
     if (this._dailyTimerId) {
       this._log.trace("_rescheduleDailyTimer - clearing existing timeout");
       Policy.clearDailyTimeout(this._dailyTimerId);
     }