X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.cpp;h=c985fd8ac9ab5a0d36cb3a008366f788eb3fed2a;hb=305361800bfae50d8c3192744d260fd640fec4d0;hp=aaab0a3b2512d4a517d584127a5bafc8f513696b;hpb=56047f5a23df5c2c583a102b8015bbec5a7da9f1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp
index aaab0a3b2..c985fd8ac 100644
--- a/src/bin/lttng-sessiond/ust-app.cpp
+++ b/src/bin/lttng-sessiond/ust-app.cpp
@@ -19,7 +19,6 @@
 #include "lttng-ust-ctl.hpp"
 #include "lttng-ust-error.hpp"
 #include "notification-thread-commands.hpp"
-#include "rotate.hpp"
 #include "session.hpp"
 #include "ust-app.hpp"
 #include "ust-consumer.hpp"
@@ -6193,11 +6192,9 @@ static void ust_app_synchronize(struct ltt_ust_session *usess, struct ust_app *a
 	ret = find_or_create_ust_app_session(usess, app, &ua_sess, nullptr);
 	if (ret < 0) {
 		/* Tracer is probably gone or ENOMEM. */
-		if (ua_sess) {
-			destroy_app_session(app, ua_sess);
-		}
 		goto end;
 	}
+
 	LTTNG_ASSERT(ua_sess);
 
 	pthread_mutex_lock(&ua_sess->lock);
@@ -6613,7 +6610,7 @@ static int handle_app_register_channel_notification(int sock,
 				goto reply;
 			}
 		}
-	} catch (std::exception& ex) {
+	} catch (const std::exception& ex) {
 		ERR("Failed to handle application context: %s", ex.what());
 		ret_code = -EINVAL;
 		goto reply;
@@ -6843,7 +6840,7 @@ static int add_enum_ust_registry(int sock,
 		application_reply_code = 0;
 	} catch (const std::exception& ex) {
 		ERR("%s: %s",
-		    fmt::format(
+		    lttng::format(
 			    "Failed to create or find enumeration provided by application: app = {}, enumeration name = {}",
 			    *app,
 			    name)