projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't assume that Log4j and JUL share the same log level mappings
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
enable_events.c
diff --git
a/src/bin/lttng/commands/enable_events.c
b/src/bin/lttng/commands/enable_events.c
index 07f5f1a9876c49c3d8214e026ed4fb1132a31d89..0e4fdc61ed3e6391e0c5bde0c5a9c943c70fb91a 100644
(file)
--- a/
src/bin/lttng/commands/enable_events.c
+++ b/
src/bin/lttng/commands/enable_events.c
@@
-134,7
+134,7
@@
static void usage(FILE *ofp)
fprintf(ofp, "\n");
fprintf(ofp, " --loglevel name\n");
fprintf(ofp, " Tracepoint loglevel range from 0 to loglevel.\n");
fprintf(ofp, "\n");
fprintf(ofp, " --loglevel name\n");
fprintf(ofp, " Tracepoint loglevel range from 0 to loglevel.\n");
- fprintf(ofp, " For JUL/LOG4j
domain
, see the table below for the range values.\n");
+ fprintf(ofp, " For JUL/LOG4j
/Python domains
, see the table below for the range values.\n");
fprintf(ofp, " --loglevel-only name\n");
fprintf(ofp, " Tracepoint loglevel (only this loglevel)\n");
fprintf(ofp, "\n");
fprintf(ofp, " --loglevel-only name\n");
fprintf(ofp, " Tracepoint loglevel (only this loglevel)\n");
fprintf(ofp, "\n");
@@
-781,8
+781,10
@@
static int enable_events(char *session_name)
assert(opt_userspace || opt_jul || opt_log4j || opt_python);
if (opt_userspace) {
ev.loglevel = -1;
assert(opt_userspace || opt_jul || opt_log4j || opt_python);
if (opt_userspace) {
ev.loglevel = -1;
- } else if (opt_jul
|| opt_log4j
) {
+ } else if (opt_jul) {
ev.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
ev.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+ } else if (opt_log4j) {
+ ev.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
} else if (opt_python) {
ev.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG;
}
} else if (opt_python) {
ev.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG;
}
This page took
0.027266 seconds
and
5
git commands to generate.