From 46e1e57d39e877c9ed6c14be0d00be2dccfe876d Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Mon, 15 May 2023 20:16:43 +0200 Subject: [PATCH] fix(core): multiple condition log should not be sent on the database --- .../models/conditions/types/MultipleCondition.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/io/kestra/core/models/conditions/types/MultipleCondition.java b/core/src/main/java/io/kestra/core/models/conditions/types/MultipleCondition.java index db20f179bc0..9dd2aea04ad 100644 --- a/core/src/main/java/io/kestra/core/models/conditions/types/MultipleCondition.java +++ b/core/src/main/java/io/kestra/core/models/conditions/types/MultipleCondition.java @@ -17,6 +17,7 @@ import io.kestra.core.models.triggers.multipleflows.MultipleConditionStorageInterface; import io.kestra.core.models.triggers.multipleflows.MultipleConditionWindow; import io.kestra.core.services.FlowService; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import java.time.Duration; @@ -71,6 +72,7 @@ ) } ) +@Slf4j public class MultipleCondition extends Condition { @NotNull @NotBlank @@ -119,8 +121,6 @@ public class MultipleCondition extends Condition { */ @Override public boolean test(ConditionContext conditionContext) throws InternalException { - Logger logger = conditionContext.getRunContext().logger(); - MultipleConditionStorageInterface multipleConditionStorage = conditionContext.getMultipleConditionStorage(); Objects.requireNonNull(multipleConditionStorage); @@ -147,14 +147,14 @@ public boolean test(ConditionContext conditionContext) throws InternalException boolean result = conditions.size() == validatedCount; - if (result && logger.isDebugEnabled()) { - logger.debug( + if (result && log.isDebugEnabled()) { + log.debug( "[namespace: {}] [flow: {}] Multiple conditions validated !", conditionContext.getFlow().getNamespace(), conditionContext.getFlow().getId() ); - } else if (logger.isTraceEnabled()) { - logger.trace( + } else if (log.isTraceEnabled()) { + log.trace( "[namespace: {}] [flow: {}] Multiple conditions failed ({}/{}) with '{}'", conditionContext.getFlow().getNamespace(), conditionContext.getFlow().getId(),