src.ctf.lttng-live: add live_viewer_connection destructor

[babeltrace.git] / src / plugins / ctf / lttng-live / viewer-connection.cpp

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp
index 0b9f71324d98c3ee34ed7381a07f1a111f148eec..42faae3b4cb2b3eb4f82088e028eb7a030fc89d5 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.cpp
+++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp
@@ -1624,28 +1624,17 @@ enum lttng_live_viewer_status live_viewer_connection_create(
     goto end;
 
 error:
-    if (viewer_connection) {
-        live_viewer_connection_destroy(viewer_connection);
-    }
+    delete viewer_connection;
+
 end:
     return status;
 }
 
-void live_viewer_connection_destroy(struct live_viewer_connection *viewer_connection)
+live_viewer_connection::~live_viewer_connection()
 {
-    if (!viewer_connection) {
-        goto end;
-    }
+    BT_CPPLOGD_SPEC(this->logger, "Closing connection to relay: relay-url=\"{}\"", this->url);
 
-    BT_CPPLOGD_SPEC(viewer_connection->logger, "Closing connection to relay: relay-url=\"{}\"",
-                    viewer_connection->url);
-
-    lttng_live_disconnect_viewer(viewer_connection);
-
-    delete viewer_connection;
+    lttng_live_disconnect_viewer(this);
 
     bt_socket_fini();
-
-end:
-    return;
 }