librados: use Messenger factory method

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

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 8be0c761a2279c6ac61700265100cbc13fd2b354..56f52bb4314081e2ebbde81e5ee255e57c090aa7 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -30,7 +30,7 @@
 
 #include "messages/MWatchNotify.h"
 #include "messages/MLog.h"
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 // needed for static_cast
 #include "messages/PaxosServiceMessage.h"
@@ -209,7 +209,8 @@ int librados::RadosClient::connect()
 
   err = -ENOMEM;
   nonce = getpid() + (1000000 * (uint64_t)rados_instance.inc());
-  messenger = new SimpleMessenger(cct, entity_name_t::CLIENT(-1), "radosclient", nonce);
+  messenger = Messenger::create(cct, entity_name_t::CLIENT(-1),
+                               "radosclient", nonce);
   if (!messenger)
     goto out;
 

diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index c4410f4b74f2e6708a86f7903c6b37b3682bbcf7..23960622521bf9f49af97c050df7c0c3a56d8aef 100755 (executable)
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -32,7 +32,7 @@ struct md_config_t;
 class Message;
 class MWatchNotify;
 class MLog;
-class SimpleMessenger;
+class Messenger;
 
 class librados::RadosClient : public Dispatcher
 {
@@ -47,7 +47,7 @@ private:
   } state;
 
   MonClient monclient;
-  SimpleMessenger *messenger;
+  Messenger *messenger;
 
   uint64_t instance_id;