X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fjul-thread.c;h=b4a71d79849d36d739020faa6733e1916cfaca76;hb=8c93562f396a3e785c5193ca32b40f1f16599a6a;hp=972186059dd3f08fa7ab5350fb804936ee16bb12;hpb=f20baf8e44b5d8a1c90b8b029b876762f6f916a6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/jul-thread.c b/src/bin/lttng-sessiond/jul-thread.c
index 972186059..b4a71d798 100644
--- a/src/bin/lttng-sessiond/jul-thread.c
+++ b/src/bin/lttng-sessiond/jul-thread.c
@@ -141,6 +141,8 @@ static struct lttcomm_sock *init_tcp_socket(void)
 
 	ret = sock->ops->bind(sock);
 	if (ret < 0) {
+		WARN("An other session daemon is using this JUL port. JUL support "
+				"will be deactivated not interfering with the tracing.");
 		goto error;
 	}
 
@@ -223,13 +225,10 @@ static int handle_registration(struct lttcomm_sock *reg_sock)
 	jul_add_app(app);
 
 	/*
-	 * Attach JUL application to a UST app object if one exists.
-	 *
-	 * FIXME: This implies that the UST app object exists and created before
-	 * JUL registration. Must confirm or else JUL app will leak until socket is
-	 * closed by the application.
+	 * We don't need to attach the JUL app to the app. If we ever do
+	 * so, we should consider both registration order of JUL before
+	 * app and app before JUL.
 	 */
-	jul_attach_app(app);
 
 	return new_sock->fd;
 
@@ -317,10 +316,6 @@ restart:
 					goto error;
 				}
 
-				/*
-				 * FIXME: Should we try to invalidate the JUL socket in the
-				 * associated ust app.
-				 */
 				destroy_jul_app(pollfd);
 			} else if (revents & (LPOLLIN)) {
 				int new_fd;