From 3a52acde3133aab2a717fefa967b0d404e50e2d8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 6 Oct 2014 08:50:48 -0700 Subject: [PATCH] mon/MonClient: use generic Messenger factory Signed-off-by: Sage Weil (cherry picked from commit e55cb1f68ae1a04cc5d281bea57ee79ef4a8af38) --- src/mon/MonClient.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 3a6dda46a9234..1bbd4675fac66 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -12,7 +12,7 @@ * */ -#include "msg/SimpleMessenger.h" +#include "msg/Messenger.h" #include "messages/MMonGetMap.h" #include "messages/MMonGetVersion.h" #include "messages/MMonGetVersionReply.h" @@ -114,11 +114,11 @@ int MonClient::get_monmap_privately() Mutex::Locker l(monc_lock); bool temp_msgr = false; - SimpleMessenger* smessenger = NULL; + Messenger* smessenger = NULL; if (!messenger) { - messenger = smessenger = new SimpleMessenger(cct, - entity_name_t::CLIENT(-1), - "temp_mon_client", getpid()); + messenger = smessenger = Messenger::create(cct, + entity_name_t::CLIENT(-1), + "temp_mon_client", getpid()); messenger->add_dispatcher_head(this); smessenger->start(); temp_msgr = true; @@ -213,9 +213,9 @@ int MonClient::ping_monitor(const string &mon_id, string *result_reply) MonClientPinger *pinger = new MonClientPinger(cct, result_reply); - Messenger *smsgr = new SimpleMessenger(cct, - entity_name_t::CLIENT(-1), - "temp_ping_client", getpid()); + Messenger *smsgr = Messenger::create(cct, + entity_name_t::CLIENT(-1), + "temp_ping_client", getpid()); smsgr->add_dispatcher_head(pinger); smsgr->start(); -- 2.39.5