From: Sage Weil <sage@redhat.com>
Date: Wed, 5 Apr 2017 15:58:57 +0000 (-0400)
Subject: mon/MgrMonitor: make debug prefix useful
X-Git-Tag: v12.0.2~166^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2faa01bf8688dc980ff0a12eb09836ff720c0dd5;p=ceph.git

mon/MgrMonitor: make debug prefix useful

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 6e73827030e..7aabdf3c68f 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -25,7 +25,13 @@
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
-#define dout_prefix *_dout << "MgrMonitor " << __func__ << " "
+#define dout_prefix _prefix(_dout, mon, map)
+static ostream& _prefix(std::ostream *_dout, Monitor *mon,
+			const MgrMap& mgrmap) {
+  return *_dout << "mon." << mon->name << "@" << mon->rank
+		<< "(" << mon->get_state_name()
+		<< ").mgr e" << mgrmap.get_epoch() << " ";
+}
 
 void MgrMonitor::create_initial()
 {