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 6e73827030e158a8850e3abc4689323e91509a7a..7aabdf3c68f18eac3dbf49a778e56b668f441457 100644 (file)
--- 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()
 {