mon/LogMonitor: add mon_cluster_log_to_stderr

Optionally send cluster log messages to stderr (prefixed by the
channel).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 49b327e8657695a359ea63e427b5de2e4525f480)

diff --git a/src/common/options.cc b/src/common/options.cc
index b47300a4fb6a61689b7d80c31c2556700ae46f30..edeca57f914afc4038b309cb40a06d08268c445b 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -405,6 +405,10 @@ std::vector<Option> get_global_options() {
     .set_default("12201")
     .set_description(""),
 
+    Option("mon_cluster_log_to_stderr", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    .set_default(false)
+    .set_description("Send cluster log messages to stderr (prefixed by channel)"),
+
     Option("mon_cluster_log_to_syslog", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("default=false")
     .set_description(""),

diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index b52767f9bceb8563dda0a866a16c568e8b623653..178f78589df5fb80c74becba716dd72b6f976689 100644 (file)
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -116,6 +116,10 @@ void LogMonitor::update_from_paxos(bool *need_bootstrap)
       if (channel.empty()) // keep retrocompatibility
         channel = CLOG_CHANNEL_CLUSTER;
 
+      if (g_conf->get_val<bool>("mon_cluster_log_to_stderr")) {
+       cerr << channel << " " << le << std::endl;
+      }
+
       if (channels.do_log_to_syslog(channel)) {
         string level = channels.get_level(channel);
         string facility = channels.get_facility(channel);