Merge remote-tracking branch 'origin' into 1.8.7

brixen · brixen · commit d9d8b4cea220 · 2015-06-19T22:35:32.000-07:00
diff --git a/vm/environment.cpp b/vm/environment.cpp
@@ -132,10 +132,9 @@ namespace rubinius {
   }
 
   void cpp_exception_bug() {
-    std::cerr << "[BUG] Uncaught C++ internal exception\n";
-    std::cerr << "So sorry, it appears that you've encountered an internal\n";
-    std::cerr << "bug. Please report this on the rubinius issue tracker.\n";
-    std::cerr << "Include the following backtrace in the issue:\n\n";
+    utilities::logger::fatal("[BUG: Uncaught C++ exception]");
+    utilities::logger::fatal("Please report this with the following backtrace to " \
+        "https://github.com/rubinius/rubinius/issues");
 
     rubinius::abort();
   }
@@ -579,6 +578,8 @@ namespace rubinius {
   void Environment::halt(STATE) {
     utilities::thread::Mutex::LockGuard guard(halt_lock_);
 
+    utilities::logger::write("exiting: %s %d", shared->pid.c_str(), exit_code(state));
+
     state->shared().tool_broker()->shutdown(state);
 
     if(ObjectMemory* om = state->memory()) {
diff --git a/vm/exception.cpp b/vm/exception.cpp
@@ -117,26 +117,25 @@ namespace rubinius {
   }
 
   void abort() {
-    std::cout << "Abort!" << std::endl;
+    utilities::logger::fatal("The Rubinius process is aborting");
     print_backtrace();
     ::abort();
   }
 
   void bug(const char* message) {
-    std::cerr << "[BUG: " << message << "]\n";
+    utilities::logger::fatal("[BUG: %s]", message);
     print_backtrace();
     ::abort();
   }
 
   void bug(const char* message, const char* arg) {
-    std::cerr << "[BUG: " << message
-              << ": " << arg
-              << "]\n";
+    utilities::logger::fatal("[BUG: %s: %s]", message, arg);
     print_backtrace();
     ::abort();
   }
 
   void warn(const char* message) {
+    utilities::logger::warn("[WARNING: %s]", message);
     std::cerr << "[WARNING: " << message << "]\n";
     print_backtrace();
   }
@@ -146,6 +145,7 @@ namespace rubinius {
     demangle(s);
 
     for(size_t i = 0; i < s.size(); i++) {
+      utilities::logger::warn("%s", s[i].c_str());
       std::cout << s[i] << std::endl;
     }
   }
@@ -185,6 +185,7 @@ namespace rubinius {
     if(!backtrace) return;
 
     for(size_t i = 0; i < backtrace->size(); i++) {
+      utilities::logger::warn("%s", backtrace->at(i).c_str());
       std::cout << backtrace->at(i) << std::endl;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -117,26 +117,25 @@ namespace rubinius {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`void abort() {`
`120`		`- std::cout << "Abort!" << std::endl;`
	`120`	`+ utilities::logger::fatal("The Rubinius process is aborting");`
`121`	`121`	`print_backtrace();`
`122`	`122`	`::abort();`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`void bug(const char* message) {`
`126`		`- std::cerr << "[BUG: " << message << "]\n";`
	`126`	`+ utilities::logger::fatal("[BUG: %s]", message);`
`127`	`127`	`print_backtrace();`
`128`	`128`	`::abort();`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`void bug(const char* message, const char* arg) {`
`132`		`- std::cerr << "[BUG: " << message`
`133`		`- << ": " << arg`
`134`		`- << "]\n";`
	`132`	`+ utilities::logger::fatal("[BUG: %s: %s]", message, arg);`
`135`	`133`	`print_backtrace();`
`136`	`134`	`::abort();`
`137`	`135`	`}`
`138`	`136`
`139`	`137`	`void warn(const char* message) {`
	`138`	`+ utilities::logger::warn("[WARNING: %s]", message);`
`140`	`139`	`std::cerr << "[WARNING: " << message << "]\n";`
`141`	`140`	`print_backtrace();`
`142`	`141`	`}`
`@@ -146,6 +145,7 @@ namespace rubinius {`
`146`	`145`	`demangle(s);`
`147`	`146`
`148`	`147`	`for(size_t i = 0; i < s.size(); i++) {`
	`148`	`+ utilities::logger::warn("%s", s[i].c_str());`
`149`	`149`	`std::cout << s[i] << std::endl;`
`150`	`150`	`}`
`151`	`151`	`}`
`@@ -185,6 +185,7 @@ namespace rubinius {`
`185`	`185`	`if(!backtrace) return;`
`186`	`186`
`187`	`187`	`for(size_t i = 0; i < backtrace->size(); i++) {`
	`188`	`+ utilities::logger::warn("%s", backtrace->at(i).c_str());`
`188`	`189`	`std::cout << backtrace->at(i) << std::endl;`
`189`	`190`	`}`
`190`	`191`	`}`