Re-init logger lock after fork.

rubinius · Mar 23, 2016 · 17f6450 · 17f6450
1 parent 29f702e
commit 17f6450
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/machine/environment.cpp b/machine/environment.cpp
@@ -218,6 +218,7 @@ namespace rubinius {
   }
 
   void Environment::start_logging(STATE) {
+    utilities::logger::init();
     utilities::logger::logger_level level = utilities::logger::eWarn;
 
     if(!config.system_log_level.value.compare("fatal")) {
@@ -581,10 +582,10 @@ namespace rubinius {
   }
 
   void Environment::halt(STATE, int exit_code) {
-    utilities::thread::Mutex::LockGuard guard(halt_lock_);
-
     utilities::logger::write("exit process: %s %d", shared->pid.c_str(), exit_code);
 
+    utilities::thread::Mutex::LockGuard guard(halt_lock_);
+
     state->shared().tool_broker()->shutdown(state);
 
     if(Memory* om = state->memory()) {

diff --git a/machine/util/logger.cpp b/machine/util/logger.cpp
@@ -23,6 +23,10 @@ namespace rubinius {
       static Logger* logger_ = 0;
       static logger_level loglevel_ = eWarn;
 
+      void init() {
+        lock_.init();
+      }
+
       void open(logger_type type, const char* identifier, logger_level level, ...) {
         lock_.init();
         va_list varargs;

diff --git a/machine/util/logger.hpp b/machine/util/logger.hpp
@@ -32,6 +32,7 @@ namespace rubinius {
       void info(const char* message, ...);
       void debug(const char* message, ...);
 
+      void init();
       void set_label();
       void set_loglevel(logger_level level);
 

diff --git a/machine/vm.cpp b/machine/vm.cpp
@@ -286,6 +286,7 @@ namespace rubinius {
   }
 
   void VM::after_fork_child(STATE) {
+    utilities::logger::init();
     utilities::logger::set_label();
 
     thread_nexus_->after_fork_child(state);