mon: fix MonSession operator<<

Print the object, not its pointer.  Make output unambiguously
terminated.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 19f6580a7c3f2475c67abd20db175faf6b9263bb..87042f62561c00d6128bd685d344a1a20a92ace3 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3466,7 +3466,7 @@ void Monitor::dispatch(MonOpRequestRef op)
     s = session_map.new_session(m->get_source_inst(), m->get_connection().get());
     assert(s);
     m->get_connection()->set_priv(s->get());
-    dout(10) << "ms_dispatch new session " << s << " for " << s->inst << dendl;
+    dout(10) << "ms_dispatch new session " << s << " " << *s << dendl;
     op->set_session(s);
 
     logger->set(l_mon_num_sessions, session_map.get_size());

diff --git a/src/mon/Session.h b/src/mon/Session.h
index a3260210fe78651a7c0e28bde2312f04b66c8b63..ff8073027908bcfa23c763e9f66ccc92664fe364 100644 (file)
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -204,11 +204,11 @@ struct MonSessionMap {
   }
 };
 
-inline ostream& operator<<(ostream& out, const MonSession *s)
+inline ostream& operator<<(ostream& out, const MonSession& s)
 {
-  out << "MonSession: " << s->inst << " is "
-      << (s->closed ? "closed" : "open");
-  out << s->caps;
+  out << "MonSession(" << s.inst << " is "
+      << (s.closed ? "closed" : "open");
+  out << s.caps << ")";
   return out;
 }