Load: add message indication that a name override was carried out

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

diff --git a/src/bin/lttng/commands/load.c b/src/bin/lttng/commands/load.c
index 8fa718ed522fced8bdb942c92f26be0f6b366360..0516351ea8ddaddfbe4fdfb312c6f986d16ef6c7 100644 (file)
--- a/src/bin/lttng/commands/load.c
+++ b/src/bin/lttng/commands/load.c
@@ -31,6 +31,7 @@
 
 static char *opt_input_path;
 static char *opt_override_url;
+static char *opt_override_session_name;
 static int opt_force;
 static int opt_load_all;
 
@@ -47,12 +48,13 @@ static struct mi_writer *writer;
 
 static struct poptOption load_opts[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-       {"help",        'h',  POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
-       {"all",         'a',  POPT_ARG_NONE, 0, OPT_ALL, 0, 0},
-       {"input-path",  'i',  POPT_ARG_STRING, &opt_input_path, 0, 0, 0},
-       {"force",       'f',  POPT_ARG_NONE, 0, OPT_FORCE, 0, 0},
-       {"override-url",'U',  POPT_ARG_STRING, &opt_override_url, 0, 0, 0},
-       {"list-options",  0,  POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
+       {"help",          'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+       {"all",           'a', POPT_ARG_NONE, 0, OPT_ALL, 0, 0},
+       {"input-path",    'i', POPT_ARG_STRING, &opt_input_path, 0, 0, 0},
+       {"force",         'f', POPT_ARG_NONE, 0, OPT_FORCE, 0, 0},
+       {"override-url",    0, POPT_ARG_STRING, &opt_override_url, 0, 0, 0},
+       {"override-name",   0, POPT_ARG_STRING, &opt_override_session_name, 0, 0, 0},
+       {"list-options",    0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
        {0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -114,9 +116,33 @@ static int mi_load_print(const char *session_name)
                }
        }
 
-       /* Close load element */
-       ret = mi_lttng_writer_close_element(writer);
+       /* Print override elements */
+       ret = mi_lttng_writer_open_element(writer, mi_lttng_element_load_overrides);
+       if (ret) {
+               goto end;
+       }
+
+       /* Session name override element */
+       if (opt_override_session_name) {
+               ret = mi_lttng_writer_write_element_string(writer,
+                               config_element_name, opt_override_session_name);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+       /* Session url override element */
+       if (opt_override_url) {
+               ret = mi_lttng_writer_write_element_string(writer,
+                               mi_lttng_element_load_override_url,
+                               opt_override_url);
+               if (ret) {
+                       goto end;
+               }
+       }
 
+       /* Close override and load element */
+       ret = mi_lttng_close_multi_element(writer, 2);
 end:
        return ret;
 }
@@ -258,6 +284,21 @@ int cmd_load(int argc, const char **argv)
                }
        }
 
+       if (opt_override_session_name) {
+               if (opt_load_all) {
+                       ERR("Options --all and --override-name cannot be used simultaneously");
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+               ret = lttng_load_session_attr_set_override_session_name(session_attr,
+                               opt_override_session_name);
+               if (ret) {
+                       ERR("Failed to set session name override");
+                       ret = CMD_ERROR;
+                       goto end;
+               }
+       }
+
        ret = lttng_load_session(session_attr);
        if (ret) {
                ERR("%s", lttng_strerror(ret));
@@ -269,13 +310,19 @@ int cmd_load(int argc, const char **argv)
                } else if (session_name) {
                        ret = config_init((char *) session_name);
                        if (ret < 0) {
-                               ret = CMD_WARNING;
+                               WARN("Could not set %s as the default session",
+                                               session_name);
                        }
                        MSG("Session %s has been loaded successfully", session_name);
                } else {
                        MSG("Session has been loaded successfully");
                }
 
+               if (opt_override_session_name) {
+                       MSG("Session name overridden with %s",
+                                       opt_override_session_name);
+               }
+
                if (opt_override_url) {
                        MSG("Session output url overridden with %s", opt_override_url);
                }