Skip to content

Commit

Permalink
Merge pull request #252 from xm-online/fix/XM1-35242-master
Browse files Browse the repository at this point in the history
XM1-35242 FIX: logging issue https://github.com/xm-online/xm-commons/…
  • Loading branch information
major13ua committed Apr 15, 2024
2 parents f0a2a82 + 4c2471e commit 90d6466
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gradle/version.gradle
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<SchedulerEventHandler> 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.");
}
}
}
Expand Down

0 comments on commit 90d6466

Please sign in to comment.