RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 06:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

common: don't do special things for unprivileged daemons

Browse Source 
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 <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-10-15 14:35:20 -07:00
parent 5aa237e8a8
commit 4f403c26dc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/common_init.cc
View File

@ -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;