From: Sage Weil <sage@newdream.net>
Date: Tue, 4 Oct 2011 22:56:35 +0000 (-0700)
Subject: rgw: more sane defaults
X-Git-Tag: v0.37~83^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e9969e7c1324faeaeaf3c90c440e76f13f0e114;p=ceph.git

rgw: more sane defaults

Notably, this gives us log_to_stderr = 1.

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

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index efb9b6df3b81..071c7c4e0e25 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -254,7 +254,10 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
+  global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
+	      CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS | CINIT_FLAG_NO_BANNER);
+  g_conf->set_val("daemonize", false);
+
   common_init_finish(g_ceph_context);
 
   sighandler_usr1 = signal(SIGUSR1, godown_handler);