X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=f83d053aa00859da61a4e6cd8a9ae0ab465c7148;hb=6e7241fe92e7b5db872d164c3e1a0f75ce5a1463;hp=b9dc1efb095de163ff3d4ca50bfba28ed6596378;hpb=dcd5daf2e2acb0745d5e6ff66185147007e8ed53;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index b9dc1efb0..f83d053aa 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -105,6 +105,7 @@ void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
 		case LTTNG_DOMAIN_KERNEL:
 		case LTTNG_DOMAIN_UST:
 		case LTTNG_DOMAIN_JUL:
+		case LTTNG_DOMAIN_LOG4J:
 			memcpy(dst, src, sizeof(struct lttng_domain));
 			break;
 		default:
@@ -704,7 +705,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 	/* Don't add filter for the '*' event. */
 	if (ev->name[0] != '*') {
 		if (filter) {
-			err = asprintf(&jul_filter, "%s && logger_name == \"%s\"", filter,
+			err = asprintf(&jul_filter, "(%s) && (logger_name == \"%s\")", filter,
 					ev->name);
 		} else {
 			err = asprintf(&jul_filter, "logger_name == \"%s\"", ev->name);
@@ -728,7 +729,7 @@ static char *set_jul_filter(const char *filter, struct lttng_event *ev)
 		if (filter || jul_filter) {
 			char *new_filter;
 
-			err = asprintf(&new_filter, "%s && int_loglevel %s %d",
+			err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)",
 					jul_filter ? jul_filter : filter, op,
 					ev->loglevel);
 			if (jul_filter) {
@@ -938,7 +939,8 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 * filtering by logger name.
 	 */
 	if (exclusion_count == 0 && filter_expression == NULL &&
-			handle->domain.type != LTTNG_DOMAIN_JUL) {
+			(handle->domain.type != LTTNG_DOMAIN_JUL &&
+				handle->domain.type != LTTNG_DOMAIN_LOG4J)) {
 		goto ask_sessiond;
 	}
 
@@ -948,8 +950,10 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 */
 
 	/* Parse filter expression */
-	if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL) {
-		if (handle->domain.type == LTTNG_DOMAIN_JUL) {
+	if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
+			|| handle->domain.type == LTTNG_DOMAIN_LOG4J) {
+		if (handle->domain.type == LTTNG_DOMAIN_JUL ||
+				handle->domain.type == LTTNG_DOMAIN_LOG4J) {
 			char *jul_filter;
 
 			/* Setup JUL filter if needed. */