Bug 1252215 - [webext] Fix startup and manifest validation errors reporting in Extension.jsm. r?kmag draft
authorLuca Greco <lgreco@mozilla.com>
Wed, 24 Aug 2016 19:15:26 +0200
changeset 408053 572ad6793dfe3c6d12145bd16d4ab166d9c75d3c
parent 408052 a11b666a0b91482f90a85ccb891fc80262dd57d4
child 408054 cadcab44ad80be09632bc15490b83e43f6a0f280
child 408855 641da09df3aa20bc139c231fbb277c37db82bab4
push id28126
push userluca.greco@alcacoop.it
push dateWed, 31 Aug 2016 16:05:42 +0000
reviewerskmag
bugs1252215
milestone51.0a1
Bug 1252215 - [webext] Fix startup and manifest validation errors reporting in Extension.jsm. r?kmag MozReview-Commit-ID: CbcW5nxQtsP
toolkit/components/extensions/Extension.jsm
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -1512,18 +1512,20 @@ this.Extension = class extends Extension
       GlobalManager.init(this);
 
       Management.emit("startup", this);
 
       return this.runManifest(this.manifest);
     }).then(() => {
       Management.emit("ready", this);
     }).catch(e => {
-      dump(`Extension error: ${e.message} ${e.filename || e.fileName}:${e.lineNumber} :: ${e.stack || new Error().stack}\n`);
-      Cu.reportError(e);
+      if (e instanceof Error) {
+        dump(`Extension '${this.id}' error: ${e.message} ${e.filename || e.fileName}:${e.lineNumber} :: ${e.stack || new Error().stack}\n`);
+        Cu.reportError(e);
+      }
 
       if (started) {
         ExtensionManagement.shutdownExtension(this.uuid);
       }
 
       this.cleanupGeneratedFile();
 
       throw e;