X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=ac7f7c910317d45158ac75991fa55cea17af7610;hp=57324820bd6aa2c3e09da7f3d0106c8f80c5b89d;hb=3e3665b89947ebdd812bcfaca1090d22b34d5778;hpb=28ab59d0baef178a8629ec9fb517ba75efb46ea8

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 57324820b..ac7f7c910 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1335,8 +1335,8 @@ static void destroy_all_sessions_and_wait(void)
 			goto unlock_session;
 		}
 		(void) cmd_stop_trace(session);
-		(void) cmd_destroy_session(session,
-				notification_thread_handle);
+		(void) cmd_destroy_session(session, notification_thread_handle,
+				NULL);
 	unlock_session:
 		session_unlock(session);
 		session_put(session);
@@ -1369,6 +1369,14 @@ static int launch_run_as_worker(const char *procname)
 			&config);
 }
 
+static void sessiond_uuid_log(void)
+{
+	char uuid_str[UUID_STR_LEN];
+
+	lttng_uuid_to_str(sessiond_uuid, uuid_str);
+	DBG("Starting lttng-sessiond {%s}", uuid_str);
+}
+
 /*
  * main
  */
@@ -1465,6 +1473,7 @@ int main(int argc, char **argv)
 	set_clock_plugin_env();
 
 	sessiond_config_log(&config);
+	sessiond_uuid_log();
 
 	if (create_lttng_rundir()) {
 		retval = -1;