From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Fri, 29 Apr 2011 17:21:08 +0000 (-0700)
Subject: common_init: don't modify log_per_instance
X-Git-Tag: v0.28~128
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=689a1bdd6e13061e7258eb11020d520d1c5101bc;p=ceph.git

common_init: don't modify log_per_instance

check it in DoutStreambuf instead.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/common/DoutStreambuf.cc b/src/common/DoutStreambuf.cc
index a705eee3b1a72..9ac48db348fb5 100644
--- a/src/common/DoutStreambuf.cc
+++ b/src/common/DoutStreambuf.cc
@@ -400,7 +400,7 @@ _calculate_opath(const md_config_t *conf) const
   // If conf->log_file was specified, that takes the highest priority
   if (!conf->log_file.empty()) {
     string log_file(normalize_relative(conf->log_file.c_str()));
-    if (conf->log_per_instance) {
+    if ((conf->log_per_instance) && (g_code_env == CODE_ENVIRONMENT_DAEMON)) {
       ostringstream oss;
       oss << log_file << "." << getpid();
       return oss.str();
@@ -415,7 +415,7 @@ _calculate_opath(const md_config_t *conf) const
   else
     log_dir = normalize_relative(conf->log_dir.c_str());
 
-  if (conf->log_per_instance) {
+  if ((conf->log_per_instance) && (g_code_env == CODE_ENVIRONMENT_DAEMON)) {
     char hostname[255];
     memset(hostname, 0, sizeof(hostname));
     int ret = gethostname(hostname, sizeof(hostname));
@@ -467,7 +467,7 @@ _read_ofile_config(const md_config_t *conf)
 
   symlink_dir = _get_symlink_dir(conf);
 
-  if (conf->log_per_instance) {
+  if ((conf->log_per_instance) && (g_code_env == CODE_ENVIRONMENT_DAEMON)) {
     // Calculate instance symlink path (isym_path)
     ostringstream iss;
     iss << symlink_dir << "/" << conf->name.to_str();
diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 1c84e033ece64..cfc6158a46117 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -164,11 +164,6 @@ void common_init(std::vector < const char* >& args,
 
   conf->parse_argv(args); // argv override
 
-  if (code_env != CODE_ENVIRONMENT_DAEMON) {
-    // The symlink stuff only really makes sense for daemons
-    conf->log_per_instance = false;
-  }
-
   // Expand metavariables. Invoke configuration observers.
   conf->apply_changes();