From: Sage Weil <sage@redhat.com>
Date: Tue, 15 Sep 2015 16:32:02 +0000 (-0400)
Subject: mon: fix MonSession operator<<
X-Git-Tag: v9.1.0~135^2~1^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b309e97c92b658ec7cd5febaabdcd44cc79d742;p=ceph.git

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 19f6580a7c3f..87042f62561c 100644
--- 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 a3260210fe78..ff8073027908 100644
--- 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;
 }