Make validate_url_option_combination static in create.c

[lttng-tools.git] / src / bin / lttng / commands / create.c

diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c
index a7d2d89bece3a4bdefa83f8712dd329a6afb39b0..10e5ffdbc02cbdbfa496376440a856fe664d91c7 100644 (file)
--- a/src/bin/lttng/commands/create.c
+++ b/src/bin/lttng/commands/create.c
@@ -236,7 +236,6 @@ struct lttng_session_descriptor *create_session_descriptor(void)
                descriptor = lttng_session_descriptor_live_network_create(
                                opt_session_name, uri_str1, uri_str2,
                                opt_live_timer);
-
        } else {
                /* Regular session. */
                switch (output_type) {
@@ -261,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);
@@ -621,6 +637,7 @@ end:
        return ret;
 }
 
+static
 int validate_url_option_combination(void)
 {
        int ret = 0;