From 4c2471e1dcc3eb2993ac1c7d43e20634b37d25cd Mon Sep 17 00:00:00 2001 From: ichupryna Date: Mon, 15 Apr 2024 14:24:52 +0300 Subject: [PATCH] XM1-35242 FIX: logging issue https://github.com/xm-online/xm-commons/issues/250 --- gradle/version.gradle | 2 +- .../scheduler/service/SchedulerEventService.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gradle/version.gradle b/gradle/version.gradle index 8bf62e2d..956e5b1c 100644 --- a/gradle/version.gradle +++ b/gradle/version.gradle @@ -1,6 +1,6 @@ import java.util.regex.Pattern -version = "3.2.1"//detectSemVersion() +version = "3.2.2"//detectSemVersion() logger.lifecycle("Project version: $version") String detectSemVersion() { diff --git a/xm-commons-scheduler/src/main/java/com/icthh/xm/commons/scheduler/service/SchedulerEventService.java b/xm-commons-scheduler/src/main/java/com/icthh/xm/commons/scheduler/service/SchedulerEventService.java index 8a336162..be784697 100644 --- a/xm-commons-scheduler/src/main/java/com/icthh/xm/commons/scheduler/service/SchedulerEventService.java +++ b/xm-commons-scheduler/src/main/java/com/icthh/xm/commons/scheduler/service/SchedulerEventService.java @@ -25,27 +25,29 @@ public void processSchedulerEvent(ScheduledEvent event, String tenantKey) { } if (handlers == null) { - log.warn("No handlers found. Event: {} skipper.", event); + log.warn("No handlers found. Event: {} skipped.", event); return; } List eventHandlers = handlers.stream() .filter(handler -> Objects.equals(handler.eventType(), event.getTypeKey()) || isHandlersForAll(handler)) .collect(toList()); + if (eventHandlers.isEmpty()) { - log.warn("No handlers found. Event: {} skipper.", event); - } else { - log.warn("Fount {} handlers found. Event: {} skipper.", eventHandlers.size(), event); + log.warn("No handlers found. Event: {} skipped.", event); + return; } + log.debug("Found {} handlers for event: {}", eventHandlers.size(), event); + try { eventHandlers.forEach(handler -> handler.onEvent(event, tenantKey)); } catch (Exception e) { - log.error("Error process message {}", event); + log.error("Error process event {} error {}", event, e.getMessage()); if (event.getEndDate() != null) { throw e; } else { - log.info("End date in null. Error will be skiped"); + log.info("End date in null. Error will be skipped."); } } }