Bug 1035773 - Change AsyncShutdown timeout crash prefix from "ERROR:" to "FATAL ERROR:"; r=Yoric
authorEd Morley <emorley@mozilla.com>
Thu, 10 Jul 2014 16:40:24 +0100
changeset 193399 1a4c6cb3174310e15f0e42bf343c9caa5ac2ff6d
parent 193398 51216e6b96826192b17317e2c52ad812e03319dc
child 193400 91f25a63dea90712cd525597cc64b257c4a83b4f
push id27117
push userryanvm@gmail.com
push dateThu, 10 Jul 2014 22:23:14 +0000
treeherdermozilla-central@e1a037c085d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersYoric
bugs1035773
milestone33.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 1035773 - Change AsyncShutdown timeout crash prefix from "ERROR:" to "FATAL ERROR:"; r=Yoric
toolkit/modules/AsyncShutdown.jsm
--- a/toolkit/modules/AsyncShutdown.jsm
+++ b/toolkit/modules/AsyncShutdown.jsm
@@ -96,18 +96,18 @@ function log(msg, prefix = "", error = n
     if (typeof error == "object" && "stack" in error) {
       dump(prefix + error.stack + "\n");
     }
   }
 }
 function warn(msg, error = null) {
   return log(msg, "WARNING: ", error);
 }
-function err(msg, error = null) {
-  return log(msg, "ERROR: ", error);
+function fatalerr(msg, error = null) {
+  return log(msg, "FATAL ERROR: ", error);
 }
 
 // Utility function designed to get the current state of execution
 // of a blocker.
 // We are a little paranoid here to ensure that in case of evaluation
 // error we do not block the AsyncShutdown.
 function safeGetState(fetchState) {
   if (!fetchState) {
@@ -716,17 +716,17 @@ Barrier.prototype = Object.freeze({
           // within the first 200 characters of the message. This
           // helps automatically sort oranges.
           let msg = "AsyncShutdown timeout in " + topic +
             " Conditions: " + JSON.stringify(state) +
             " At least one completion condition failed to complete" +
 	    " within a reasonable amount of time. Causing a crash to" +
 	    " ensure that we do not leave the user with an unresponsive" +
 	    " process draining resources.";
-	  err(msg);
+	  fatalerr(msg);
 	  if (gCrashReporter && gCrashReporter.enabled) {
             let data = {
               phase: topic,
               conditions: state
 	    };
             gCrashReporter.annotateCrashReport("AsyncShutdownTimeout",
               JSON.stringify(data));
 	  } else {