From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Nov 2011 20:07:34 +0000 (-0800)
Subject: common: libraries should not log to stdout/stderr
X-Git-Tag: v0.39~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=685450b76bb0e9ef2acb62a8f92de33880330768;p=ceph.git

common: libraries should not log to stdout/stderr

Certainly not by default.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index d883be9d310..1d874f0d680 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -48,19 +48,24 @@ CephContext *common_preinit(const CephInitParameters &iparams,
 
   // Set some defaults based on code type
   switch (code_env) {
-    case CODE_ENVIRONMENT_DAEMON:
-      conf->set_val_or_die("daemonize", "true");
-      if (!(flags & CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS)) {
-	conf->set_val_or_die("pid_file", "/var/run/ceph/$type.$id.pid");
-	conf->set_val_or_die("admin_socket", "/var/run/ceph/$name.asok");
-	conf->set_val_or_die("log_file", "/var/log/ceph/$name.log");
-      }
-      conf->set_val_or_die("log_to_stderr", "false");
-      conf->set_val_or_die("err_to_stderr", "true");
-      break;
-    default:
-      conf->set_val_or_die("daemonize", "false");
-      break;
+  case CODE_ENVIRONMENT_DAEMON:
+    conf->set_val_or_die("daemonize", "true");
+    if (!(flags & CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS)) {
+      conf->set_val_or_die("pid_file", "/var/run/ceph/$type.$id.pid");
+      conf->set_val_or_die("admin_socket", "/var/run/ceph/$name.asok");
+      conf->set_val_or_die("log_file", "/var/log/ceph/$name.log");
+    }
+    conf->set_val_or_die("log_to_stderr", "false");
+    conf->set_val_or_die("err_to_stderr", "true");
+    break;
+
+  case CODE_ENVIRONMENT_LIBRARY:
+    conf->set_val_or_die("log_to_stderr", "false");
+    conf->set_val_or_die("err_to_stderr", "false");
+    break;
+
+  default:
+    break;
   }
   return cct;
 }