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>

diff --git a/src/common/options.cc b/src/common/options.cc
index 91f48dcee2bb73202ccd82335cc87af763128f11..d1b1e4fc6e9704e65fd3192d8f6a212f19a02605 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -430,6 +430,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 9c9541933bca972f32d31de577ebe5737cbcc225..ffd50ba5050d6f7cfd54d3efbf73c231c443ce8d 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);