mgr/Session: keep inst, not addr

For parity with log messages from other daemons etc.

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

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index b6e2bc6079b5b8213b3beff85ff0f9dc1ee2dc8c..429db5faa5359783b4a39ccab1d8cf79bcf06563 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -128,7 +128,7 @@ bool DaemonServer::ms_verify_authorizer(Connection *con,
   }
 
   MgrSessionRef s(new MgrSession);
-  s->addr = con->get_peer_addr();
+  s->inst.addr = con->get_peer_addr();
   AuthCapsInfo caps_info;
 
   is_valid = handler->verify_authorizer(
@@ -383,6 +383,8 @@ bool DaemonServer::handle_command(MCommand *m)
     return true;
   }
   session->put(); // SessionRef takes a ref
+  if (session->inst.name == entity_name_t())
+    session->inst.name = m->get_source();
 
   string format;
   boost::scoped_ptr<Formatter> f;

diff --git a/src/mgr/MgrSession.h b/src/mgr/MgrSession.h
index 39b3dff7023c8459f7e7546fe2a161b2de40373c..328871d2ef962945f2b114f1f30c68026b999f79 100644 (file)
--- a/src/mgr/MgrSession.h
+++ b/src/mgr/MgrSession.h
@@ -16,7 +16,7 @@
 struct MgrSession : public RefCountedObject {
   uint64_t global_id = 0;
   EntityName entity_name;
-  entity_addr_t addr;
+  entity_inst_t inst;
 
   // mon caps are suitably generic for mgr
   MonCap caps;