From 685450b76bb0e9ef2acb62a8f92de33880330768 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 Nov 2011 12:07:34 -0800 Subject: [PATCH] common: libraries should not log to stdout/stderr Certainly not by default. Signed-off-by: Sage Weil --- src/common/common_init.cc | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/common/common_init.cc b/src/common/common_init.cc index d883be9d31069..1d874f0d68035 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; } -- 2.39.5