Add destructors, make ringloop optional in cluster_client_t

2020-06-23 20:10:33 +03:00
parent 62343c8022
commit 8736b3ad32
4 changed files with 27 additions and 6 deletions
@@ -59,13 +59,24 @@ cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd
    st_cli.parse_config(config);
    st_cli.load_global_config();

-    consumer.loop = [this]()
+    if (ringloop)
    {
-        msgr.read_requests();
-        msgr.send_replies();
-        this->ringloop->submit();
-    };
-    ringloop->register_consumer(&consumer);
+        consumer.loop = [this]()
+        {
+            msgr.read_requests();
+            msgr.send_replies();
+            this->ringloop->submit();
+        };
+        ringloop->register_consumer(&consumer);
+    }
+}
+
+cluster_client_t::~cluster_client_t()
+{
+    if (ringloop)
+    {
+        ringloop->unregister_consumer(&consumer);
+    }
 }

 void cluster_client_t::continue_ops()