]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: more sane defaults
authorSage Weil <sage@newdream.net>
Tue, 4 Oct 2011 22:56:35 +0000 (15:56 -0700)
committerSage Weil <sage@newdream.net>
Tue, 4 Oct 2011 23:02:47 +0000 (16:02 -0700)
Notably, this gives us log_to_stderr = 1.

Signed-off-by: Sage Weil <sage@newdream.net>
src/rgw/rgw_main.cc

index efb9b6df3b812cfe14f556a5d1e31bc59ac87c43..071c7c4e0e2507dabff28a8297778c7955f35ddd 100644 (file)
@@ -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);