Merge 9c9bb6a into 5f8dd26

CJSCommonPlatform · Jan 17, 2020 · 308544f · 308544f
2 parents 5f8dd26 + 9c9bb6a
commit 308544f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 ### Fixed
 - Fixed catchup error where catchup was marked as complete after all subscriptions rather than all components
 
+### Added
+- Added event source name to catchup logger output
+
 ## [2.4.5] - 2020-01-06
 ### Removed
 - Remove mechanism to also drop/add trigger on SUSPEND/UNSUSPEND as it causes 

diff --git a/.../uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java b/.../uk/gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessor.java
@@ -66,7 +66,7 @@ public void performEventCatchup(final CatchupSubscriptionContext catchupSubscrip
             final Long eventNumber = event.getEventNumber().orElseThrow(() -> new MissingEventNumberException(format("PublishedEvent with id '%s' is missing its event number", event.getId())));
 
             if (eventNumber % 1000L == 0) {
-                logger.info(format("%s for Event Number: %d", catchupCommand.getName(), eventNumber));
+                logger.info(format("%s with Event Source: %s for Event Number: %d", catchupCommand.getName(), eventSourceName, eventNumber));
             }
 
             return concurrentEventStreamConsumerManager.add(event, subscriptionName, catchupCommand, commandId);

diff --git a/...gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java b/...gov/justice/services/eventstore/management/catchup/process/EventCatchupProcessorTest.java
@@ -66,7 +66,7 @@ public void shouldFetchAllMissingEventsAndProcess() throws Exception {
 
         final UUID commandId = randomUUID();
         final String subscriptionName = "subscriptionName";
-        final String eventSourceName = "event source";
+        final String eventSourceName = "example.event.source";
         final String componentName = "EVENT_LISTENER";
         final long eventNumberFrom = 999L;
 
@@ -130,8 +130,8 @@ public void shouldFetchAllMissingEventsAndProcess() throws Exception {
                 catchupCompetedAt,
                 events.size()));
 
-        verify(logger).info("Finding all missing events for event source 'event source', component 'EVENT_LISTENER");
-        verify(logger).info("CATCHUP for Event Number: " + (eventNumberFrom + 1L));
+        verify(logger).info("Finding all missing events for event source 'example.event.source', component 'EVENT_LISTENER");
+        verify(logger).info("CATCHUP with Event Source: example.event.source for Event Number: " + (eventNumberFrom + 1L));
         verify(logger).info("3 active PublishedEvents queued for publishing");
         verify(logger).info("Waiting for publishing consumer completion...");
     }