From 4f403c26dc0048ad63e20d20369fa86bfb31c50e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 15 Oct 2013 14:35:20 -0700 Subject: [PATCH] common: don't do special things for unprivileged daemons We generally do want an admin socket and log, and people usually run these as root. This is more confusing than useful. Fixes: #6334 Signed-off-by: Sage Weil --- src/common/common_init.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/common/common_init.cc b/src/common/common_init.cc index ef8cf0100724..18fdf7267870 100644 --- a/src/common/common_init.cc +++ b/src/common/common_init.cc @@ -75,12 +75,8 @@ CephContext *common_preinit(const CephInitParameters &iparams, if ((flags & CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS) || code_env != CODE_ENVIRONMENT_DAEMON) { - // no default log, pid_file, admin_socket - conf->set_val_or_die("pid_file", ""); - conf->set_val_or_die("admin_socket", ""); - conf->set_val_or_die("log_file", ""); - // use less memory for logs - conf->set_val_or_die("log_max_recent", "500"); + // do nothing special! we used to do no default log, pid_file, + // admin_socket, but changed our minds. } return cct; -- 2.47.3