Improve lttng add-context message output

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

diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c
index 6c374d17da93ffbd16174d88883f7dec7a35f908..2f3bce1f5bed2ccffc872a699f1cd8b8ac486e10 100644 (file)
--- a/src/bin/lttng/commands/add_context.c
+++ b/src/bin/lttng/commands/add_context.c
@@ -405,14 +405,26 @@ static int add_context(char *session_name)
                ret = lttng_add_context(handle, &context, opt_event_name,
                                opt_channel_name);
                if (ret < 0) {
-                       ERR("%s: ", type->opt->symbol);
+                       ERR("%s: %s", type->opt->symbol, lttng_strerror(ret));
                        warn = 1;
                        continue;
                } else {
-                       MSG("%s context %s added to %s event in %s",
-                                       opt_kernel ? "kernel" : "UST", type->opt->symbol,
-                                       opt_event_name ? opt_event_name : "all",
-                                       opt_channel_name ? opt_channel_name : "all channels");
+                       if (opt_channel_name && opt_event_name) {
+                               MSG("%s context %s added to event %s channel %s",
+                                               opt_kernel ? "kernel" : "UST", type->opt->symbol,
+                                               opt_channel_name, opt_event_name);
+                       } else if (opt_channel_name && !opt_event_name) {
+                               MSG("%s context %s added to channel %s",
+                                               opt_kernel ? "kernel" : "UST", type->opt->symbol,
+                                               opt_channel_name);
+                       } else if (!opt_channel_name && opt_event_name) {
+                               MSG("%s context %s added to event %s",
+                                               opt_kernel ? "kernel" : "UST", type->opt->symbol,
+                                               opt_event_name);
+                       } else {
+                               MSG("%s context %s added to all channels",
+                                               opt_kernel ? "kernel" : "UST", type->opt->symbol)
+                       }
                }
        }