From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 24 Apr 2019 20:06:01 +0000 (-0400)
Subject: Fix: relayd not spawned on default-url live session creation
X-Git-Tag: v2.11.0-rc2~25
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f1301311523ec1e86593bf16f5b9074f65d4c899;p=lttng-tools.git

Fix: relayd not spawned on default-url live session creation

b178f53e9 introduced a regression that causes the lttng client to
not spawn a relay daemon automatically when a live session is
created using the default url parameters.

This fix re-introduces an equivalent check to restore the
previous behaviour.

Reported-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index fb8b10b04..438e88f4c 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -260,6 +260,23 @@ struct lttng_session_descriptor *create_session_descriptor(void)
 	}
 	if (!descriptor) {
 		ERR("Failed to initialize session creation command.");
+	} else {
+		/*
+		 * Auto-launch the relay daemon when a live session
+		 * is created using default URLs.
+		 */
+		if (!opt_url && !opt_ctrl_url && !opt_data_url &&
+				opt_live_timer && !check_relayd()) {
+			int ret;
+			const char *pathname = opt_relayd_path ? :
+					INSTALL_BIN_PATH "/lttng-relayd";
+
+			ret = spawn_relayd(pathname, 0);
+			if (ret < 0) {
+				lttng_session_descriptor_destroy(descriptor);
+				descriptor = NULL;
+			}
+		}
 	}
 end:
 	free(uris);