global: make daemon banner print explicit

This eliminates some flags and avoids annoying cases where the banner is
printed but we don't want to see it.

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

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index a329d6dc76e7e6331950cd0ee005152f93c52948..fee778606436fe8b0b89fda4b6585dd9f8923b21 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -208,6 +208,8 @@ int main(int argc, const char **argv)
     usage();
   }
 
+  global_print_banner();
+
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
   messenger->bind(g_conf->public_addr, getpid());
   cout << "starting " << g_conf->name << " at " << messenger->get_ms_addr()

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index f0cca8ccf5681bd0195d60c5a3683aba4d9eff83..55d6436bbc0b5fede1676a1085c4591707fb47ef 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -342,6 +342,8 @@ int main(int argc, const char **argv)
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
   int rank = monmap.get_rank(g_conf->name.get_id());
 
+  global_print_banner();
+
   cout << "starting " << g_conf->name << " rank " << rank
        << " at " << ipaddr
        << " mon_data " << g_conf->mon_data

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 0bcec16607faede974c811df82f1f03354d98731..c51b6824444112082484c75c4d40b203e0bac40b 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -259,6 +259,8 @@ int main(int argc, const char **argv)
     hb_addr.set_port(0);
   messenger_hbout->bind(hb_addr, getpid());
 
+  global_print_banner();
+
   cout << "starting osd." << whoami
        << " at " << client_messenger->get_ms_addr() 
        << " osd_data " << g_conf->osd_data

diff --git a/src/common/common_init.h b/src/common/common_init.h
index 2d23bda473d3f390f60146c10aee801cdc889a88..88ef485859a970657d16cd4aceade676c3f2a2ab 100644 (file)
--- a/src/common/common_init.h
+++ b/src/common/common_init.h
@@ -34,9 +34,6 @@ enum common_init_flags_t {
 
   // Don't close stderr (in daemonize)
   CINIT_FLAG_NO_CLOSE_STDERR = 0x4,
-
-  // no banner on startup
-  CINIT_FLAG_NO_BANNER = 0x8,
 };
 
 /*

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 2ef48186b371a7339c258897f9ccd273411864ac..5d9fa513de311fd3662f3d58ce38f00f75fbbafb 100644 (file)
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -100,15 +100,6 @@ void global_init(std::vector < const char* >& args,
   block_signals(siglist, NULL);
   install_standard_sighandlers();
 
-  if (code_env == CODE_ENVIRONMENT_DAEMON &&
-      (flags & CINIT_FLAG_NO_BANNER) == 0) {
-    cout << TEXT_YELLOW
-        << " ** WARNING: Ceph is still under development.  Any feedback can be directed  **"
-        << TEXT_NORMAL << "\n" << TEXT_YELLOW
-        << " **          at ceph-devel@vger.kernel.org or http://ceph.newdream.net/.     **"
-        << TEXT_NORMAL << std::endl;
-    output_ceph_version();
-  }
   if (g_lockdep) {
     cout << TEXT_YELLOW << "*** lockdep is enabled (" << g_lockdep
         << ") ***" << TEXT_NORMAL << std::endl;
@@ -117,6 +108,16 @@ void global_init(std::vector < const char* >& args,
   register_assert_context(cct);
 }
 
+void global_print_banner(void)
+{
+  cout << TEXT_YELLOW
+       << " ** WARNING: Ceph is still under development.  Any feedback can be directed  **"
+       << TEXT_NORMAL << "\n" << TEXT_YELLOW
+       << " **          at ceph-devel@vger.kernel.org or http://ceph.newdream.net/.     **"
+       << TEXT_NORMAL << std::endl;
+  output_ceph_version();
+}
+
 static void pidfile_remove_void(void)
 {
   pidfile_remove();

diff --git a/src/global/global_init.h b/src/global/global_init.h
index af6034eea2c7fa50b9f0ae868705a65854ae4c8a..6f3f2e5c3e666389e21073260195fd282138afba 100644 (file)
--- a/src/global/global_init.h
+++ b/src/global/global_init.h
@@ -56,4 +56,9 @@ void global_init_chdir(const CephContext *cct);
  */
 int global_init_shutdown_stderr(CephContext *cct);
 
+/**
+ * print daemon startup banner/warning
+ */
+void global_print_banner(void);
+
 #endif

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 858d08a8ba1bb6701efb64fb41790c68afe4ac09..c4c6f929743a4c182f80b7f2cd83618b9b9b9b27 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -254,7 +254,7 @@ int main(int argc, const char **argv)
   argv_to_vec(argc, argv, args);
   env_to_vec(args);
   global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
-             CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS | CINIT_FLAG_NO_BANNER);
+             CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS);
 
   pid_t childpid = 0;
   if (g_conf->daemonize) {