diff options
| author | Sage Weil <sage@newdream.net> | 2011-12-01 18:17:00 +0100 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-12-01 18:17:51 +0100 |
| commit | f6ee3699c9623b33397762c3fe031de9a9a5075b (patch) | |
| tree | 0c627054546edff814d4fab5fbf50701a74382f7 /src/global | |
| parent | mds: fix usage text (diff) | |
| download | ceph-f6ee3699c9623b33397762c3fe031de9a9a5075b.tar.xz ceph-f6ee3699c9623b33397762c3fe031de9a9a5075b.zip | |
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>
Diffstat (limited to 'src/global')
| -rw-r--r-- | src/global/global_init.cc | 19 | ||||
| -rw-r--r-- | src/global/global_init.h | 5 |
2 files changed, 15 insertions, 9 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 2ef48186b37..5d9fa513de3 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 af6034eea2c..6f3f2e5c3e6 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 |