X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=805cdb1d27157e73c674a93d6c13195b5d27fe36;hb=9c6bda17fc9edd28c46e52fdf439d37da81e8d9a;hp=b14b45cd6e1fd31435612590f34e8e07d3f97a28;hpb=4b861950d3e6782fbcc6a3f85855d0c1ef58c1f4;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index b14b45cd6..805cdb1d2 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -91,11 +91,6 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                       You can change it with the enable-consumer cmd\n");
 	fprintf(ofp, "  -C, --ctrl-url=URL   Set control path URL. (Must use -D also)\n");
 	fprintf(ofp, "  -D, --data-url=URL   Set data path URL. (Must use -C also)\n");
-	fprintf(ofp, "      --no-consumer    Don't activate a consumer for this session.\n");
-	fprintf(ofp, "                       OBSELETE\n");
-	fprintf(ofp, "      --disable-consumer\n");
-	fprintf(ofp, "                       Disable consumer for this session.\n");
-	fprintf(ofp, "                       OBSELETE\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Please refer to the man page (lttng(1)) for more information on network\n");
 	fprintf(ofp, "streaming mechanisms and explanation of the control and data port\n");
@@ -253,7 +248,7 @@ static int create_session(void)
 	} else if (opt_url) { /* Handling URL (-U opt) */
 		url = opt_url;
 		print_str_url = url;
-	} else if (opt_ctrl_url == NULL && opt_data_url == NULL) {
+	} else {
 		/* Auto output path */
 		alloc_path = config_get_default_path();
 		if (alloc_path == NULL) {
@@ -274,10 +269,16 @@ static int create_session(void)
 		}
 
 		url = alloc_url;
-		print_str_url = alloc_url + strlen("file://");
+		if (!opt_data_url && !opt_ctrl_url) {
+			print_str_url = alloc_url + strlen("file://");
+		}
 	}
 
-	assert(url);
+	if ((!opt_ctrl_url && opt_data_url) || (opt_ctrl_url && !opt_data_url)) {
+		ERR("You need both control and data URL.");
+		ret = CMD_ERROR;
+		goto error;
+	}
 
 	ret = _lttng_create_session_ext(session_name, url, datetime);
 	if (ret < 0) {
@@ -287,28 +288,24 @@ static int create_session(void)
 			WARN("Session %s already exists", session_name);
 			break;
 		default:
-			ERR("%s", lttng_strerror(ret));
 			break;
 		}
 		goto error;
 	}
 
-	MSG("Session %s created.", session_name);
-	if (print_str_url) {
-		MSG("Traces will be written in %s", print_str_url);
-	}
-
 	if (opt_ctrl_url && opt_data_url) {
 		/* Setting up control URI (-C or/and -D opt) */
 		ret = set_consumer_url(session_name, opt_ctrl_url, opt_data_url);
 		if (ret < 0) {
+			/* Destroy created session because the URL are not valid. */
+			lttng_destroy_session(session_name);
 			goto error;
 		}
-	} else if ((!opt_ctrl_url && opt_data_url) ||
-			(opt_ctrl_url && !opt_data_url)) {
-		ERR("You need both control and data URL.");
-		ret = CMD_ERROR;
-		goto error;
+	}
+
+	MSG("Session %s created.", session_name);
+	if (print_str_url) {
+		MSG("Traces will be written in %s", print_str_url);
 	}
 
 	/* Init lttng session config */
@@ -318,7 +315,6 @@ static int create_session(void)
 		goto error;
 	}
 
-
 	ret = CMD_SUCCESS;
 
 error: