projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: preserve jul/log4j domain loglevels
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.cpp
diff --git
a/src/bin/lttng-sessiond/cmd.cpp
b/src/bin/lttng-sessiond/cmd.cpp
index 79cb6fed89398e00833f2ea27620090eba09e81e..c1588bc3a37dc3dc1dd9b0facf981a33707b4111 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.cpp
+++ b/
src/bin/lttng-sessiond/cmd.cpp
@@
-484,14
+484,22
@@
static enum lttng_error_code list_lttng_ust_global_events(char *channel_name,
tmp_event->exclusion = 1;
}
tmp_event->exclusion = 1;
}
+ std::vector<const char *> exclusion_names;
+ if (uevent->exclusion) {
+ for (int i = 0; i < uevent->exclusion->count; i++) {
+ exclusion_names.emplace_back(
+ LTTNG_EVENT_EXCLUSION_NAME_AT(uevent->exclusion, i));
+ }
+ }
+
/*
* We do not care about the filter bytecode and the fd from the
* userspace_probe_location.
*/
ret = lttng_event_serialize(tmp_event,
/*
* We do not care about the filter bytecode and the fd from the
* userspace_probe_location.
*/
ret = lttng_event_serialize(tmp_event,
-
uevent->exclusion ? uevent->exclusion->count : 0
,
-
uevent->exclusion ? (char **) uevent->exclusion->names
:
- nullptr,
+
exclusion_names.size()
,
+
exclusion_names.size() ? exclusion_names.data()
:
+
nullptr,
uevent->filter_expression,
0,
nullptr,
uevent->filter_expression,
0,
nullptr,
@@
-2087,8
+2095,6
@@
static int _cmd_enable_event(struct ltt_session *session,
}
}
}
}
- DBG("Enable event command for event \'%s\'", event->name);
-
lttng::urcu::read_lock_guard read_lock;
switch (domain->type) {
lttng::urcu::read_lock_guard read_lock;
switch (domain->type) {
@@
-2330,6
+2336,7
@@
static int _cmd_enable_event(struct ltt_session *session,
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
memset(&uevent, 0, sizeof(uevent));
uevent.type = LTTNG_EVENT_TRACEPOINT;
uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+ uevent.loglevel = -1;
default_event_name = event_get_default_agent_ust_name(domain->type);
if (!default_event_name) {
ret = LTTNG_ERR_FATAL;
default_event_name = event_get_default_agent_ust_name(domain->type);
if (!default_event_name) {
ret = LTTNG_ERR_FATAL;
This page took
0.024624 seconds
and
4
git commands to generate.