From f6ee3699c9623b33397762c3fe031de9a9a5075b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 1 Dec 2011 09:17:00 -0800 Subject: [PATCH] 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 --- src/ceph_mds.cc | 2 ++ src/ceph_mon.cc | 2 ++ src/ceph_osd.cc | 2 ++ src/common/common_init.h | 3 --- src/global/global_init.cc | 19 ++++++++++--------- src/global/global_init.h | 5 +++++ src/rgw/rgw_main.cc | 2 +- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index a329d6dc76e7e..fee778606436f 100644 --- 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 f0cca8ccf5681..55d6436bbc0b5 100644 --- 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 0bcec16607fae..c51b682444411 100644 --- 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 2d23bda473d3f..88ef485859a97 100644 --- 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 2ef48186b371a..5d9fa513de311 100644 --- 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 af6034eea2c7f..6f3f2e5c3e666 100644 --- 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 858d08a8ba1bb..c4c6f929743a4 100644 --- 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) { -- 2.39.5