[3.5.2] expose wait_for_removal in .disconnect of redis_client redis_subcriber future_client #74

Author: Cylix

includes/cpp_redis/future_client.hpp

@@ -61,7 +61,7 @@ class future_client {
 
   //! handle connection
   void connect(const std::string& host = "127.0.0.1", std::size_t port = 6379, const disconnection_handler_t& disconnection_handler = nullptr);
-  void disconnect(void);
+  void disconnect(bool wait_for_removal = false);
   bool is_connected();
 
   //! send cmd

includes/cpp_redis/redis_client.hpp

@@ -54,7 +54,7 @@ class redis_client {
   typedef std::function<void(redis_client&)> disconnection_handler_t;
   void connect(const std::string& host = "127.0.0.1", std::size_t port = 6379,
     const disconnection_handler_t& disconnection_handler = nullptr);
-  void disconnect(void);
+  void disconnect(bool wait_for_removal = false);
   bool is_connected(void);
 
   //! send cmd

includes/cpp_redis/redis_subscriber.hpp

@@ -49,7 +49,7 @@ class redis_subscriber {
   //! handle connection
   typedef std::function<void(redis_subscriber&)> disconnection_handler_t;
   void connect(const std::string& host = "127.0.0.1", std::size_t port = 6379, const disconnection_handler_t& disconnection_handler = nullptr);
-  void disconnect(void);
+  void disconnect(bool wait_for_removal = false);
   bool is_connected(void);
 
   //! ability to authenticate on the redis server if necessary

sources/future_client.cpp

@@ -44,7 +44,7 @@ future_client::connect(const std::string& host, std::size_t port, const disconne
 }
 
 void
-future_client::disconnect(void) { m_client.disconnect(); }
+future_client::disconnect(bool wait_for_removal) { m_client.disconnect(wait_for_removal); }
 
 bool
 future_client::is_connected(void) { return m_client.is_connected(); }

sources/redis_client.cpp

@@ -56,9 +56,9 @@ redis_client::connect(const std::string& host, std::size_t port,
 }
 
 void
-redis_client::disconnect(void) {
+redis_client::disconnect(bool wait_for_removal) {
   __CPP_REDIS_LOG(debug, "cpp_redis::redis_client attempts to disconnect");
-  m_client.disconnect();
+  m_client.disconnect(wait_for_removal);
   __CPP_REDIS_LOG(info, "cpp_redis::redis_client disconnected");
 }
 

sources/redis_subscriber.cpp

@@ -70,9 +70,9 @@ redis_subscriber::auth(const std::string& password, const reply_callback_t& repl
 }
 
 void
-redis_subscriber::disconnect(void) {
+redis_subscriber::disconnect(bool wait_for_removal) {
   __CPP_REDIS_LOG(debug, "cpp_redis::redis_subscriber attempts to disconnect");
-  m_client.disconnect();
+  m_client.disconnect(wait_for_removal);
   __CPP_REDIS_LOG(info, "cpp_redis::redis_subscriber disconnected");
 }