Print backtraces for panics, even if the constellation has closed.

2 files changed, 12 insertions, 5 deletions

diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 291ed48dd1b..fcf174cc8f6 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -1090,7 +1090,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
         if opts::get().hard_fail {
             // It's quite difficult to make Servo exit cleanly if some threads have failed.
             // Hard fail exists for test runners so we crash and that's good enough.
-            println!("Pipeline failed in hard-fail mode.  Crashing!\n{}\n{}", reason, backtrace.unwrap_or_default());
+            println!("Pipeline failed in hard-fail mode.  Crashing!");
             process::exit(1);
         }
 
diff --git a/components/servo/main.rs b/components/servo/main.rs
index 7da24dd1dc2..321c41f9716 100644
--- a/components/servo/main.rs
+++ b/components/servo/main.rs
@@ -34,10 +34,12 @@ extern crate servo;
 #[macro_use]
 extern crate sig;
 
+use backtrace::Backtrace;
 use servo::Browser;
 use servo::compositing::windowing::WindowEvent;
 use servo::util::opts::{self, ArgumentParsingResult};
 use servo::util::servo_version;
+use std::env;
 use std::panic;
 use std::process;
 use std::rc::Rc;
@@ -97,8 +99,8 @@ fn main() {
         None
     };
 
-    // TODO: once log-panics is released, this can be replaced by
-    // log_panics::init();
+    // TODO: once log-panics is released, can this be replaced by
+    // log_panics::init()?
     panic::set_hook(Box::new(|info| {
         warn!("Panic hook called.");
         let msg = match info.payload().downcast_ref::<&'static str>() {
@@ -111,10 +113,15 @@ fn main() {
         let current_thread = thread::current();
         let name = current_thread.name().unwrap_or("<unnamed>");
         if let Some(location) = info.location() {
-            error!("{} (thread {}, at {}:{})", msg, name, location.file(), location.line());
+            println!("{} (thread {}, at {}:{})", msg, name, location.file(), location.line());
         } else {
-            error!("{} (thread {})", msg, name);
+            println!("{} (thread {})", msg, name);
         }
+        if env::var("RUST_BACKTRACE").is_ok() {
+            println!("{:?}", Backtrace::new());
+        }
+
+        error!("{}", msg);
     }));
 
     setup_logging();