Merge remote-tracking branch 'origin' into 1.8.7

Conflicts: gems_list.txt
rubinius · Mar 30, 2015 · be8cdcc · be8cdcc
2 parents 9fd4421 + 3682bd3
commit be8cdcc
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 30 deletions.
diff --git a/library/rubinius/configuration.rb b/library/rubinius/configuration.rb
@@ -172,10 +172,10 @@
   c.vm_variable "profiler.threshold", 1000000,
     "The minimum number of nanoseconds a profiler node must have to be reported"
 
-  c.vm_variable "system.tmp", "$TMPDIR",
-    "Default temp/fallback directory for the process"
-
   c.section "system" do |s|
+    s.vm_variable "tmp", "$TMPDIR",
+      "Default temp/fallback directory for the process"
+
     s.vm_variable "fsapi.path", "$TMPDIR",
       "Base directory of the Rubinius File System API files"
 
@@ -185,7 +185,7 @@
     s.vm_variable "console.access", 0660,
       "Permissions on the Rubinius Console files"
 
-    s.vm_variable "log", "/var/log/$PROGRAM_NAME.log",
+    s.vm_variable "log", "$TMPDIR/$USER-$PROGRAM_NAME.log",
       "Logging facility to use: 'syslog', 'console', or path"
 
     s.vm_variable "log.level", "warn",

diff --git a/rakelib/blueprint.rb b/rakelib/blueprint.rb
@@ -51,8 +51,7 @@
 
   gcc.ldflags << "-lm"
 
-  if Rubinius::BUILD_CONFIG[:dtrace] #and
-     #Rubinius::BUILD_CONFIG[:os] =~ /freebsd(9|10)/
+  if Rubinius::BUILD_CONFIG[:dtrace]
     gcc.ldflags << "-lelf"
     gcc.ldflags << "vm/dtrace/probes.o"
 

diff --git a/vm/environment.cpp b/vm/environment.cpp
@@ -200,34 +200,25 @@ namespace rubinius {
     } else if(!config.system_log.value.compare("console")) {
       utilities::logger::open(utilities::logger::eConsoleLogger, RBX_PROGRAM_NAME, level);
     } else {
-      const char* place_holder = "$PROGRAM_NAME";
-      size_t index = config.system_log.value.find(place_holder);
+      const char* tmpdir = "$TMPDIR";
+      size_t index = config.system_log.value.find(tmpdir);
 
       if(index != std::string::npos) {
-        config.system_log.value.replace(index, strlen(place_holder), RBX_PROGRAM_NAME);
+        config.system_log.value.replace(index, strlen(tmpdir), config.system_tmp);
       }
 
-      int fd;
+      const char* program_name = "$PROGRAM_NAME";
+      index = config.system_log.value.find(program_name);
 
-      if((fd = open(config.system_log.value.c_str(), O_CREAT, 0644)) > 0) {
-        close(fd);
-      } else if(errno == EACCES) {
-        std::ostringstream path;
-
-        if(const char* s = strrchr(config.system_log.value.c_str(), '/')) {
-          path << (s + 1);
-        } else {
-          path << config.system_log.value.c_str();
-        }
+      if(index != std::string::npos) {
+        config.system_log.value.replace(index, strlen(program_name), RBX_PROGRAM_NAME);
+      }
 
-        config.system_log.value.assign(config.system_tmp.value + path.str());
+      const char* user = "$USER";
+      index = config.system_log.value.find(user);
 
-        if((fd = open(config.system_log.value.c_str(), O_CREAT, 0644)) > 0) {
-          close(fd);
-        } else {
-          std::cerr << RBX_PROGRAM_NAME << ": unable to open log: "
-                    << config.system_log.value.c_str() << std::endl;
-        }
+      if(index != std::string::npos) {
+        config.system_log.value.replace(index, strlen(user), shared->username);
       }
 
       utilities::logger::open(utilities::logger::eFileLogger,
@@ -320,6 +311,7 @@ namespace rubinius {
     config_parser.update_configuration(config);
 
     set_tmp_path();
+    set_username();
     set_fsapi_path();
   }
 
@@ -339,9 +331,14 @@ namespace rubinius {
     }
   }
 
+  void Environment::set_username() {
+    struct passwd *user_passwd = getpwuid(getuid());
+
+    shared->username.assign(user_passwd->pw_name);
+  }
+
   void Environment::set_fsapi_path() {
     std::ostringstream path;
-    struct passwd *user_passwd = getpwuid(getuid());
 
     if(!config.system_fsapi_path.value.compare("$TMPDIR")) {
       path << config.system_tmp.value;
@@ -352,7 +349,7 @@ namespace rubinius {
       if(cpath[cpath.size() - 1] != '/') path << "/";
     }
 
-    path << "rbx-" << user_passwd->pw_name << "-" << getpid();
+    path << "rbx-" << shared->username << "-" << getpid();
 
     shared->fsapi_path.assign(path.str());
 

diff --git a/vm/environment.hpp b/vm/environment.hpp
@@ -100,6 +100,7 @@ namespace rubinius {
     void load_string(std::string str);
     void run_file(std::string path);
     void set_tmp_path();
+    void set_username();
     void set_fsapi_path();
     void load_tool();
     void run_from_filesystem();

diff --git a/vm/shared_state.hpp b/vm/shared_state.hpp
@@ -149,6 +149,7 @@ namespace rubinius {
     SymbolTable symbols;
     LLVMState* llvm_state;
     std::string fsapi_path;
+    std::string username;
     uint32_t hash_seed;
 
   public:

diff --git a/vm/signal.cpp b/vm/signal.cpp
@@ -349,6 +349,7 @@ namespace rubinius {
     logger::fatal("--- end system info ---");
 
     logger::fatal("--- begin rubinius info ---");
+    logger::fatal("user: %s", signal_thread_->shared().username.c_str());
     logger::fatal("pid: %d", getpid());
     logger::fatal("program name: %s", RBX_PROGRAM_NAME);
     logger::fatal("version: %s", RBX_VERSION);

diff --git a/vm/signal.hpp b/vm/signal.hpp
@@ -36,6 +36,10 @@ namespace rubinius {
 
     SignalThread(STATE, Configuration& config);
 
+    SharedState& shared() {
+      return shared_;
+    }
+
     void initialize(STATE);
     void setup_default_handlers();
 

diff --git a/vm/util/logger.cpp b/vm/util/logger.cpp
@@ -256,7 +256,7 @@ namespace rubinius {
 
 #define LOGGER_MAX_FILE     5242880
 #define LOGGER_OPEN_FLAGS   (O_CREAT | O_APPEND | O_WRONLY | O_CLOEXEC)
-#define LOGGER_OPEN_PERMS   0644
+#define LOGGER_OPEN_PERMS   0600
 
       FileLogger::FileLogger(const char* identifier)
         : Logger()