From 0384acea9d44acca78b770a0136311c97a1dad6a Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Wed, 7 Jun 2017 19:52:13 -0700 Subject: [PATCH] mgr/DaemonServer.cc: log daemon type string as well as id Signed-off-by: Dan Mick --- src/mgr/DaemonServer.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index faa60a77659ce..a8ac275d7cecc 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -263,12 +263,11 @@ void DaemonServer::shutdown() bool DaemonServer::handle_open(MMgrOpen *m) { - DaemonKey key( - m->get_connection()->get_peer_type(), - m->daemon_name); + uint32_t type = m->get_connection()->get_peer_type(); + DaemonKey key(type, m->daemon_name); dout(4) << "from " << m->get_connection() << " name " - << m->daemon_name << dendl; + << ceph_entity_type_name(type) << "." << m->daemon_name << dendl; auto configure = new MMgrConfigure(); configure->stats_period = g_conf->mgr_stats_period; @@ -285,12 +284,11 @@ bool DaemonServer::handle_open(MMgrOpen *m) bool DaemonServer::handle_report(MMgrReport *m) { - DaemonKey key( - m->get_connection()->get_peer_type(), - m->daemon_name); + uint32_t type = m->get_connection()->get_peer_type(); + DaemonKey key(type, m->daemon_name); dout(4) << "from " << m->get_connection() << " name " - << m->daemon_name << dendl; + << ceph_entity_type_name(type) << "." << m->daemon_name << dendl; DaemonStatePtr daemon; if (daemon_state.exists(key)) { -- 2.39.5