logger: configurable output dir

diff --git a/src/common/Logger.cc b/src/common/Logger.cc
index 12808cc996f0535778f9b7ef82a04c9c65bf4e31..aea1cbaed6059c8c6efe506b346b9c1cc5bfdd34 100644 (file)
--- a/src/common/Logger.cc
+++ b/src/common/Logger.cc
@@ -118,7 +118,8 @@ Logger::Logger(string fn, LogType *type, bool append)
       filename += "/";
     }
 
-    filename = "log/";
+    filename = g_conf.logger_dir;
+    filename += "/";
     if (g_conf.log_name) {
       filename += g_conf.log_name;
       ::mkdir( filename.c_str(), 0755 );   // make sure dir exists

diff --git a/src/config.cc b/src/config.cc
index f85d4180d6272eb26bd06e358d97eb6380589d7b..5fb73990cd53553db799d764b148eb88602958ce 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -208,8 +208,9 @@ md_config_t g_conf = {
 
   logger_calc_variance: true,
 
-  dout_dir: "out",    // if daemonize == true
+  dout_dir: "out",        // if daemonize == true
   dout_sym_dir: "out",    // if daemonize == true
+  logger_dir: "log",
 
   conf_file: "ceph.conf",
   dump_conf: false,
@@ -258,7 +259,6 @@ md_config_t g_conf = {
   clock_tare: false,
   
   // --- messenger ---
-  ms_hosts: ".ceph_hosts",
   ms_tcp_nodelay: true,
   ms_retry_interval: 2.0,  // how often to attempt reconnect 
   ms_fail_interval: 15.0,  // fail after this long
@@ -637,6 +637,7 @@ void parse_config_file(ConfFile *cf, bool auto_update)
   CF_READ("global", "log pins", log_pins);
   CF_READ_STR("global", "dout dir", dout_dir);
   CF_READ_STR("global", "dout sym dir", dout_sym_dir);
+  CF_READ_STR("global", "logger dir", logger_dir);
 
   CF_READ("debug", "debug", debug);
   CF_READ("debug", "lockdep", debug_lockdep);
@@ -943,6 +944,8 @@ void parse_config_options(std::vector<const char*>& args, bool open)
     else if (//strcmp(args[i], "-o") == 0 ||
             strcmp(args[i], "--dout_sym_dir") == 0) 
       g_conf.dout_sym_dir = args[++i];
+    else if (strcmp(args[i], "--logger_dir") == 0) 
+      g_conf.logger_dir = args[++i];
     else if (strcmp(args[i], "--conf_file") == 0) 
       g_conf.conf_file = args[++i];
 

diff --git a/src/config.h b/src/config.h
index cc7f31b1e6464ed69fd3b772bfffcddb5a85c9c5..53f02949fcc19e8ea809afdeee8ce62b5779da68 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -63,6 +63,7 @@ struct md_config_t {
 
   const char *dout_dir;
   const char *dout_sym_dir;
+  const char *logger_dir;
 
   const char *conf_file;
   bool dump_conf;