Move on-event*.* to event-rule-matches*.*

[lttng-tools.git] / src / bin / lttng-sessiond / trigger-error-query.c

diff --git a/src/bin/lttng-sessiond/trigger-error-query.c b/src/bin/lttng-sessiond/trigger-error-query.c
index bc8e7f688b6e4b3071617047ca3e314b6d34a19d..54aeb414959ae9d12cba8e47bf5ed955e4cb797a 100644 (file)
--- a/src/bin/lttng-sessiond/trigger-error-query.c
+++ b/src/bin/lttng-sessiond/trigger-error-query.c
@@ -29,6 +29,12 @@ enum lttng_trigger_status lttng_trigger_add_error_results(
                        &trigger_owner);
        assert(status == LTTNG_TRIGGER_STATUS_OK);
 
+       /* Only add discarded tracer messages count for applicable triggers. */
+       if (!lttng_trigger_needs_tracer_notifier(trigger)) {
+               status = LTTNG_TRIGGER_STATUS_OK;
+               goto end;
+       }
+
        error_accounting_status = event_notifier_error_accounting_get_count(
                        trigger, &discarded_tracer_messages_count);
        if (error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
@@ -83,8 +89,7 @@ enum lttng_trigger_status lttng_trigger_add_action_error_query_results(
                        lttng_trigger_get_action(trigger), results);
        switch (action_status) {
        case LTTNG_ACTION_STATUS_OK:
-               status = LTTNG_TRIGGER_STATUS_OK;
-               goto end;
+               break;
        default:
                status = LTTNG_TRIGGER_STATUS_ERROR;
                goto end;