Fold common_set_defaults into common_init

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/cauthtool.cc b/src/cauthtool.cc
index 786d98c58caba109982b74590cd2752e897c66f1..1cb80b1e5f1177d8ae5e68138cb9350247c577da 100644 (file)
--- a/src/cauthtool.cc
+++ b/src/cauthtool.cc
@@ -53,7 +53,6 @@ int main(int argc, const char **argv)
   env_to_vec(args);
   DEFINE_CONF_VARS(usage);
 
-  common_set_defaults(false);
   common_init(args, "cauthtool", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   const char *me = argv[0];

diff --git a/src/cconf.cc b/src/cconf.cc
index cb25aadb67134440c48e8f65c4b7b035f52c72f9..668738d73675bb4ed19d0dd5be8004ec5d9a72b3 100644 (file)
--- a/src/cconf.cc
+++ b/src/cconf.cc
@@ -150,7 +150,6 @@ int main(int argc, const char **argv)
     }
   }
 
-  common_set_defaults(false);
   common_init(nargs, type, STARTUP_FLAG_FORCE_FG_LOGGING);
 
   if (do_help) {

diff --git a/src/cfuse.cc b/src/cfuse.cc
index cceed5bbec5a2edd1d008b2a2229230b9a6c2a80..314b3309959af86a66b793ef9f6b97f5c3ba6649 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -53,8 +53,8 @@ int main(int argc, const char **argv, const char *envp[]) {
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   g_conf.daemonize = true;
+  g_conf.pid_file = 0;
   g_conf.log_per_instance = true;
   common_init(args, "cfuse", STARTUP_FLAG_INIT_KEYS);
 

diff --git a/src/cmds.cc b/src/cmds.cc
index 03de4414781acdefeb0168edde0a4349753e5a31..f0483d9fe1d0cc4bde1e433c7beca448e7f86cb3 100644 (file)
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -65,7 +65,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(true);
 #ifdef HAVE_LIBTCMALLOC
   g_conf.profiler_start = HeapProfilerStart;
   g_conf.profiler_running = IsHeapProfilerRunning;
@@ -73,7 +72,7 @@ int main(int argc, const char **argv)
   g_conf.profiler_dump = HeapProfilerDump;
   g_conf.tcmalloc_have = true;
 #endif //HAVE_LIBTCMALLOC
-  common_init(args, "mds", STARTUP_FLAG_INIT_KEYS);
+  common_init(args, "mds", STARTUP_FLAG_INIT_KEYS | STARTUP_FLAG_DAEMON);
 
   // mds specific args
   int shadow = 0;

diff --git a/src/cmon.cc b/src/cmon.cc
index 8093ed5f3c5e8beac128c778eec93501a7faaf42..e0959c87700d3783d17f2fe02b205d9d1a10e49a 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -61,8 +61,7 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(true);
-  common_init(args, "mon", STARTUP_FLAG_INIT_KEYS);
+  common_init(args, "mon", STARTUP_FLAG_INIT_KEYS | STARTUP_FLAG_DAEMON);
 
   FOR_EACH_ARG(args) {
     if (CONF_ARG_EQ("mkfs", '\0')) {

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 300ef9c93212cb5f3abd120223e057fec78f317b..ef170471b5ebd6275fab20aa8103046c502d53a2 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -54,18 +54,6 @@ void set_foreground_logging()
   g_conf.log_to_file = false;
 }
 
-void common_set_defaults(bool daemon)
-{
-  if (daemon) {
-    cout << TEXT_YELLOW << " ** WARNING: Ceph is still under heavy development, and is only suitable for **" << TEXT_NORMAL << std::endl;
-    cout << TEXT_YELLOW <<  " **          testing and review.  Do not trust it with important data.       **" << TEXT_NORMAL << std::endl;
-
-    g_conf.daemonize = true;
-  } else {
-    g_conf.pid_file = 0;
-  }
-}
-
 static void keyring_init(const char *filesearch)
 {
   const char *filename = filesearch;
@@ -121,6 +109,18 @@ static void keyring_init(const char *filesearch)
 void common_init(std::vector<const char*>& args, const char *module_type, int flags)
 {
   bool force_fg_logging = false;
+
+  if (flags & STARTUP_FLAG_DAEMON) {
+    cout << TEXT_YELLOW << " ** WARNING: Ceph is still under heavy development, "
+         << "and is only suitable for **" << TEXT_NORMAL << std::endl;
+    cout << TEXT_YELLOW <<  " **          testing and review.  Do not trust it "
+         << "with important data.       **" << TEXT_NORMAL << std::endl;
+    g_conf.daemonize = true;
+  }
+  else {
+    g_conf.pid_file = 0;
+  }
+
   parse_startup_config_options(args, module_type, flags, &force_fg_logging);
 
   if (g_conf.log_to_syslog || g_conf.clog_to_syslog) {

diff --git a/src/common/common_init.h b/src/common/common_init.h
index 428adffc60e2dd1fe8bcea7d4a8045ffe941626b..8d3b06ee9b27320f22b2c7980ef67fb126c03519 100644 (file)
--- a/src/common/common_init.h
+++ b/src/common/common_init.h
@@ -6,9 +6,9 @@
 enum {
   STARTUP_FLAG_INIT_KEYS =                      0x01,
   STARTUP_FLAG_FORCE_FG_LOGGING =               0x02,
+  STARTUP_FLAG_DAEMON =                         0x04,
 };
 
-void common_set_defaults(bool daemon);
 void common_init(std::vector<const char*>& args,
                 const char *module_type,
                  int flags);

diff --git a/src/cosd.cc b/src/cosd.cc
index 464b73967fa18e78c6468980b977c8de68499a46..2fbcb169076cbd3a3cff3269716d003e641029db 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -52,7 +52,7 @@ int main(int argc, const char **argv)
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
-  int startup_flags = STARTUP_FLAG_INIT_KEYS;
+  int startup_flags = STARTUP_FLAG_INIT_KEYS | STARTUP_FLAG_DAEMON;
   vector<const char *>::iterator args_iter;
 
   for (args_iter = args.begin(); args_iter != args.end(); ++args_iter) {
@@ -62,7 +62,6 @@ int main(int argc, const char **argv)
     } 
   }
 
-  common_set_defaults(true);
 #ifdef HAVE_LIBTCMALLOC
   g_conf.profiler_start = HeapProfilerStart;
   g_conf.profiler_running = IsHeapProfilerRunning;

diff --git a/src/csyn.cc b/src/csyn.cc
index 26c5baacd770408da3a484ffe18f078ca51602ac..bad7e7f6dfe5d14e7966cbb5bd94924e054ff634 100644 (file)
--- a/src/csyn.cc
+++ b/src/csyn.cc
@@ -46,7 +46,6 @@ int main(int argc, const char **argv, char *envp[])
   vector<const char*> args;
   argv_to_vec(argc, argv, args);
 
-  common_set_defaults(false);
   common_init(args, "csyn",
              STARTUP_FLAG_INIT_KEYS | STARTUP_FLAG_FORCE_FG_LOGGING);
 

diff --git a/src/dumpjournal.cc b/src/dumpjournal.cc
index 8fe581f8c282a2e4b1fc3ff50c1786615ae0d551..6680cb0d7817a1c8896f27527500bc731d43e6a4 100644 (file)
--- a/src/dumpjournal.cc
+++ b/src/dumpjournal.cc
@@ -81,7 +81,6 @@ int main(int argc, const char **argv, const char *envp[])
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "dumpjournal", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   vec_to_argv(args, argc, argv);

diff --git a/src/dupstore.cc b/src/dupstore.cc
index ccbcb359b3af66c90c023cc8ef9242fa952e6b46..d66da408aaee621950012c6a4d54e195fbaeb5cf 100644 (file)
--- a/src/dupstore.cc
+++ b/src/dupstore.cc
@@ -88,7 +88,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "dumpstore", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   // args

diff --git a/src/libceph.cc b/src/libceph.cc
index 705ffed26877a46e1998ecdb324813fb713399a2..7fc0a984c6064c8cc7cb7755ccf1cbcda86b81b2 100644 (file)
--- a/src/libceph.cc
+++ b/src/libceph.cc
@@ -43,7 +43,6 @@ extern "C" int ceph_initialize(int argc, const char **argv)
     //create everything to start a client
     vector<const char*> args;
     argv_to_vec(argc, argv, args);
-    common_set_defaults(false);
     common_init(args, "libceph", STARTUP_FLAG_INIT_KEYS);
     //monmap
     monclient = new MonClient();

diff --git a/src/librados-config.cc b/src/librados-config.cc
index 5c788009a01394480238e8f09eca84c2204c76a1..12f58f1517d9e978818bd55f32e24b58d75e4821 100644 (file)
--- a/src/librados-config.cc
+++ b/src/librados-config.cc
@@ -57,7 +57,6 @@ int main(int argc, const char **argv)
       ++i;
   }
 
-  common_set_defaults(false);
   common_init(args, "librados-config", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   FOR_EACH_ARG(args) {

diff --git a/src/librados.cc b/src/librados.cc
index 3fb7dae02a62188e7d0a9d6b3b93d6932390dc2e..2f8b93ecca334b7997e8ef3942daa683729185ab 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -1824,7 +1824,6 @@ int Rados::initialize(int argc, const char *argv[])
     argv_to_vec(argc, argv, args);
     env_to_vec(args);
   }
-  common_set_defaults(false);
   common_init(args, "librados", STARTUP_FLAG_INIT_KEYS);
 
   return 0;
@@ -2361,7 +2360,6 @@ extern "C" int rados_create(rados_t *pcluster)
     vector<const char*> args;
     env_to_vec(args);
 
-    common_set_defaults(false);
     common_init(args, "librados", STARTUP_FLAG_INIT_KEYS);
 
     ++rados_initialized;

diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc
index 05881ab84ef0caf3697f7ced409a526318ceede6..4767887f9427c6714de46b7240311d9f82833b47 100644 (file)
--- a/src/osdmaptool.cc
+++ b/src/osdmaptool.cc
@@ -49,7 +49,6 @@ int main(int argc, const char **argv)
   env_to_vec(args);
   DEFINE_CONF_VARS(usage);
 
-  common_set_defaults(false);
   common_init(args, "osdmaptool", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   const char *me = argv[0];

diff --git a/src/rados.cc b/src/rados.cc
index 02f41201e246afe71e458e5a25ae5c29d2deeac1..94a06ef4df888575349550478b8b8d21bb1450d5 100644 (file)
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -97,7 +97,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "rados",
              STARTUP_FLAG_FORCE_FG_LOGGING | STARTUP_FLAG_INIT_KEYS);
 

diff --git a/src/rbd.cc b/src/rbd.cc
index b95675c40cb0369131f98fbd278d9dfe60b62239..fae59d9e2902f239436e2be10623f99d99395ac9 100644 (file)
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -576,7 +576,6 @@ int main(int argc, const char **argv)
   env_to_vec(args);
 
   int opt_cmd = OPT_NO_CMD;
-  common_set_defaults(false);
   common_init(args, "rbd",
              STARTUP_FLAG_FORCE_FG_LOGGING | STARTUP_FLAG_INIT_KEYS);
 

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 4c46419ab2d7d14e7f9ddd155c8f4a5db12fbc3d..31671e41a3c04aeec6b011d09be2514b27290a63 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -83,7 +83,6 @@ int main(int argc, char **argv)
   argv_to_vec(argc, (const char **)argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "rgw",
              STARTUP_FLAG_FORCE_FG_LOGGING | STARTUP_FLAG_INIT_KEYS);
 

diff --git a/src/streamtest.cc b/src/streamtest.cc
index 1a6261ba0d0fc68461482e37df45ff02babd20c5..105fabfc4047755cf96355e7c7497351f721952e 100644 (file)
--- a/src/streamtest.cc
+++ b/src/streamtest.cc
@@ -97,7 +97,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, NULL,
              STARTUP_FLAG_FORCE_FG_LOGGING | STARTUP_FLAG_INIT_KEYS);
 

diff --git a/src/test/TestDoutStreambuf.cc b/src/test/TestDoutStreambuf.cc
index 0ac1a3d48d7c64234df48b9af679f7bcce771db4..12e15c5a283a310a04fa8bbf2d3f5b92e97a2853 100644 (file)
--- a/src/test/TestDoutStreambuf.cc
+++ b/src/test/TestDoutStreambuf.cc
@@ -36,7 +36,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "ceph", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   DoutStreambuf<char> *dos = new DoutStreambuf<char>();

diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc
index 9283532816a57fbbe518c0d73cd49936fea74fb6..8c364dae2fb43d4ad35c1575bdb0eda2279d80aa 100644 (file)
--- a/src/test/TestSignalHandlers.cc
+++ b/src/test/TestSignalHandlers.cc
@@ -94,7 +94,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "TestSignalHandlers", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   DEFINE_CONF_VARS(usage);

diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc
index 1b96b6d450930410c4be18be556ae1af034ecad3..85f3041e49c439417e97e68bd7654404b3a6513e 100644 (file)
--- a/src/test/TestTimers.cc
+++ b/src/test/TestTimers.cc
@@ -255,7 +255,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "ceph", STARTUP_FLAG_FORCE_FG_LOGGING);
 
   int ret;

diff --git a/src/test_trans.cc b/src/test_trans.cc
index ee631d2cb478bb0c38cb90abcff3ac733e8fcd41..db9580a17605982036a668326f640562fadbd7a1 100644 (file)
--- a/src/test_trans.cc
+++ b/src/test_trans.cc
@@ -36,7 +36,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, NULL, STARTUP_FLAG_FORCE_FG_LOGGING);
 
   // args

diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index c92ef95e216717926139f5d98e195028669f6087..1bb9ef11336fb6011b5b50f8e3363dbdf6821f5b 100644 (file)
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -70,7 +70,6 @@ int main(int argc, const char **argv, const char *envp[]) {
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, NULL, STARTUP_FLAG_FORCE_FG_LOGGING);
 
   vec_to_argv(args, argc, argv);

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index b4c42e7853e0612dd725e27ca2cf391c40d8f912..bec3bd3671beeb9a0a444df90a4c0325181d6f42 100644 (file)
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -114,7 +114,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "ceph",
              STARTUP_FLAG_INIT_KEYS | STARTUP_FLAG_FORCE_FG_LOGGING);
 

diff --git a/src/tools/gceph.cc b/src/tools/gceph.cc
index 930d9c714b5f25a72f6d2caa4921e28dd51c21b5..7fbb8f596502fbfc9a0264015e3cbfe99d6badaf 100644 (file)
--- a/src/tools/gceph.cc
+++ b/src/tools/gceph.cc
@@ -75,7 +75,6 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
 
-  common_set_defaults(false);
   common_init(args, "cephtool",
              STARTUP_FLAG_FORCE_FG_LOGGING | STARTUP_FLAG_INIT_KEYS);