From: David Goulet <dgoulet@efficios.com>
Date: Fri, 28 Mar 2014 17:19:47 +0000 (-0400)
Subject: Fix: don't spawn relayd if URL is provided
X-Git-Tag: v2.5.0-rc1~83
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=2c521c63a46d6c79a7819a822d109ccdd48b6064;hp=83b7c3bf7a5c28883396af5dadd6ee469f20aa59

Fix: don't spawn relayd if URL is provided

In the lttng command line tool, relayd should only be spawned for the
default use case which is no URL provided.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index 4a47d6714..e02b14142 100644
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -387,7 +387,8 @@ static int create_session(void)
 		} else {
 			pathname = INSTALL_BIN_PATH "/lttng-relayd";
 		}
-		if (!check_relayd() && spawn_relayd(pathname, 0) < 0) {
+		if (!opt_url && !opt_data_url && !check_relayd() &&
+				spawn_relayd(pathname, 0) < 0) {
 			goto error;
 		}
 		ret = lttng_create_session_live(session_name, url, opt_live_timer);