X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c7fc178cdf09820809f14c218ac236f989439317;hp=61ddf905cc37f716393a0b3e7a148456fcd2025e;hb=5cdb6027a2b78fd93aa7f61174625190b5fc3459;hpb=022d91ba14053d6093a6d6a1af02a345c6fd42d2

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 61ddf905c..c7fc178cd 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -153,7 +153,7 @@ static const struct option long_options[] = {
 	{ "verbose-consumer", 0, 0, 'Z' },
 	{ "no-kernel", 0, 0, 'N' },
 	{ "pidfile", 1, 0, 'p' },
-	{ "jul-tcp-port", 1, 0, 'J' },
+	{ "agent-tcp-port", 1, 0, 'J' },
 	{ "config", 1, 0, 'f' },
 	{ "load", 1, 0, 'l' },
 	{ "kmod-probes", 1, 0, 'P' },
@@ -2593,6 +2593,7 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 		dir_name = DEFAULT_KERNEL_TRACE_DIR;
 		break;
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_UST:
 		DBG3("Copying tracing session consumer output in UST session");
 		if (session->ust_session->consumer) {
@@ -2637,6 +2638,7 @@ static int create_ust_session(struct ltt_session *session,
 
 	switch (domain->type) {
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_UST:
 		break;
 	default:
@@ -2882,6 +2884,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 			}
 			break;
 		case LTTNG_DOMAIN_JUL:
+		case LTTNG_DOMAIN_LOG4J:
 		case LTTNG_DOMAIN_UST:
 			if (!cmd_ctx->session->ust_session) {
 				ret = LTTNG_ERR_NO_CHANNEL;
@@ -2963,6 +2966,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 
 		break;
 	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_LOG4J:
 	case LTTNG_DOMAIN_UST:
 	{
 		if (!ust_app_supported()) {
@@ -3056,6 +3060,7 @@ skip_domain:
 			cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
 		switch (cmd_ctx->lsm->domain.type) {
 		case LTTNG_DOMAIN_JUL:
+		case LTTNG_DOMAIN_LOG4J:
 		case LTTNG_DOMAIN_UST:
 			if (uatomic_read(&ust_consumerd_state) != CONSUMER_STARTED) {
 				ret = LTTNG_ERR_NO_USTCONSUMERD;
@@ -4205,7 +4210,7 @@ static void usage(void)
 	fprintf(stderr, "  -p, --pidfile FILE                 Write a pid to FILE name overriding the default value.\n");
 	fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
 	fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
-	fprintf(stderr, "      --jul-tcp-port                 JUL application registration TCP port\n");
+	fprintf(stderr, "      --agent-tcp-port               Agent registration TCP port\n");
 	fprintf(stderr, "  -f  --config                       Load daemon configuration file\n");
 	fprintf(stderr, "  -l  --load PATH                    Load session configuration\n");
 	fprintf(stderr, "      --kmod-probes                  Specify kernel module probes to load\n");
@@ -4368,11 +4373,11 @@ static int set_option(int opt, const char *arg, const char *optname)
 		errno = 0;
 		v = strtoul(arg, NULL, 0);
 		if (errno != 0 || !isdigit(arg[0])) {
-			ERR("Wrong value in --jul-tcp-port parameter: %s", arg);
+			ERR("Wrong value in --agent-tcp-port parameter: %s", arg);
 			return -1;
 		}
 		if (v == 0 || v >= 65535) {
-			ERR("Port overflow in --jul-tcp-port parameter: %s", arg);
+			ERR("Port overflow in --agent-tcp-port parameter: %s", arg);
 			return -1;
 		}
 		agent_tcp_port = (uint32_t) v;