projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve error handling of lttng cli
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
disable_channels.c
diff --git
a/src/bin/lttng/commands/disable_channels.c
b/src/bin/lttng/commands/disable_channels.c
index 05ee0e6ef65dca36c4d09efa4f65cf8d9bf21059..5fb90c5d1f1d1a26fbd7ce983fb8d2ebb5c21c99 100644
(file)
--- a/
src/bin/lttng/commands/disable_channels.c
+++ b/
src/bin/lttng/commands/disable_channels.c
@@
-88,7
+88,7
@@
static void usage(FILE *ofp)
*/
static int disable_channels(char *session_name)
{
*/
static int disable_channels(char *session_name)
{
- int ret = CMD_SUCCESS;
+ int ret = CMD_SUCCESS
, warn = 0
;
char *channel_name;
struct lttng_domain dom;
char *channel_name;
struct lttng_domain dom;
@@
-116,18
+116,25
@@
static int disable_channels(char *session_name)
ret = lttng_disable_channel(handle, channel_name);
if (ret < 0) {
ret = lttng_disable_channel(handle, channel_name);
if (ret < 0) {
- goto error;
+ ERR("Channel %s: %s (session %s)", channel_name,
+ lttng_strerror(ret), session_name);
+ warn = 1;
} else {
MSG("%s channel %s disabled for session %s",
} else {
MSG("%s channel %s disabled for session %s",
- opt_kernel ? "Kernel" : "UST", channel_name,
- session_name);
+ opt_kernel ? "Kernel" : "UST", channel_name, session_name);
}
/* Next channel */
channel_name = strtok(NULL, ",");
}
}
/* Next channel */
channel_name = strtok(NULL, ",");
}
+ ret = CMD_SUCCESS;
+
error:
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
+
lttng_destroy_handle(handle);
return ret;
lttng_destroy_handle(handle);
return ret;
This page took
0.02518 seconds
and
4
git commands to generate.