X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=c783e82f0871f9b8516654b7e1aa58d94ad13336;hp=6f7c71d0549474746ef78243f3204cd9ba014ab2;hb=07b86b528dc279d59cdf16e6cb946c144fe773f2;hpb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 6f7c71d05..c783e82f0 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -721,7 +721,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
 	struct ltt_kernel_channel *kchan;
 
 	/* Open kernel metadata */
-	if (ksess->metadata == NULL) {
+	if (ksess->metadata == NULL && ksess->output_traces) {
 		ret = kernel_open_metadata(ksess);
 		if (ret < 0) {
 			ret = LTTNG_ERR_KERN_META_FAIL;
@@ -730,7 +730,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
 	}
 
 	/* Open kernel metadata stream */
-	if (ksess->metadata_stream_fd < 0) {
+	if (ksess->metadata && ksess->metadata_stream_fd < 0) {
 		ret = kernel_open_metadata_stream(ksess);
 		if (ret < 0) {
 			ERR("Kernel create metadata stream failed");
@@ -1681,12 +1681,7 @@ int cmd_create_session_uri(char *name, struct lttng_uri *uris,
 	struct ltt_session *session;
 
 	assert(name);
-
-	/* No URIs is not possible. */
-	if (uris == NULL) {
-		ret = LTTNG_ERR_SESSION_FAIL;
-		goto session_error;
-	}
+	assert(creds);
 
 	/*
 	 * Verify if the session already exist
@@ -1725,9 +1720,15 @@ int cmd_create_session_uri(char *name, struct lttng_uri *uris,
 		goto consumer_error;
 	}
 
-	ret = cmd_set_consumer_uri(0, session, nb_uri, uris);
-	if (ret != LTTNG_OK) {
-		goto consumer_error;
+	if (uris) {
+		ret = cmd_set_consumer_uri(0, session, nb_uri, uris);
+		if (ret != LTTNG_OK) {
+			goto consumer_error;
+		}
+		session->output_traces = 1;
+	} else {
+		session->output_traces = 0;
+		DBG2("Session %s created with no output", session->name);
 	}
 
 	session->consumer->enabled = 1;