Bug 1310596 - do not allow errors in reporting migrator data recency to break the rest of the migration, r=mikedeboer, a=ritu
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 18 Oct 2016 11:54:22 +0100
changeset 350742 444760be4952778128a25c687403c2c1c5579746
parent 350741 f6ee39199d93be1dd8fc4083d499d5046fcc9b4c
child 350743 419291bc952be4598445b4bbaa7dd0665e994cfe
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer, ritu
bugs1310596
milestone50.0
Bug 1310596 - do not allow errors in reporting migrator data recency to break the rest of the migration, r=mikedeboer, a=ritu MozReview-Commit-ID: eWr0abwU7p
browser/components/migration/content/migration.js
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -420,17 +420,22 @@ var MigrationWizard = {
       break;
     case "Migration:ItemAfterMigrate":
       label = document.getElementById(aData + "_migrated");
       if (label)
         label.removeAttribute("style");
       break;
     case "Migration:Ended":
       if (this.isInitialMigration) {
-        this.reportDataRecencyTelemetry();
+        // Ensure errors in reporting data recency do not affect the rest of the migration.
+        try {
+          this.reportDataRecencyTelemetry();
+        } catch (ex) {
+          Cu.reportError(ex);
+        }
       }
       if (this._autoMigrate) {
         let hasImportedHomepage = !!(this._newHomePage && this._newHomePage != "DEFAULT");
         Services.telemetry.getKeyedHistogramById("FX_MIGRATION_IMPORTED_HOMEPAGE")
                           .add(this._source, hasImportedHomepage);
         if (this._newHomePage) {
           try {
             // set homepage properly