From 622983f5d7647b0340586030b5980ef1525a39f9 Mon Sep 17 00:00:00 2001 From: RebeccaBaker <38425793+RebeccaBaker@users.noreply.github.com> Date: Thu, 1 May 2025 08:48:19 +0100 Subject: [PATCH 1/3] Update logging statements --- .../service/PendingRequestServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java index eee45a88..2fa6ebd7 100644 --- a/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java @@ -60,14 +60,14 @@ public boolean submittedDateTimePeriodElapsed(PendingRequestEntity pendingReques LocalDateTime currentDateTime = LocalDateTime.now(); LocalDateTime submittedDateTime = pendingRequest.getSubmittedDateTime(); long hoursElapsed = ChronoUnit.HOURS.between(submittedDateTime, currentDateTime); - log.debug("Hours elapsed = {}; submittedDateTime: {}; currentDateTime: {}", + log.info("Hours elapsed = {}; submittedDateTime: {}; currentDateTime: {}", hoursElapsed, submittedDateTime, currentDateTime); boolean result = false; if (hoursElapsed >= exceptionLimitInHours) { - log.debug("Marking hearing request {} as Exception (hours elapsed exceeds limit!)", + log.info("Marking hearing request {} as Exception (hours elapsed exceeds limit!)", pendingRequest.getHearingId()); markRequestWithGivenStatus(pendingRequest.getId(), PendingStatusType.EXCEPTION.name()); - log.error("Submitted time of request with ID {} is {} hours later than before.", + log.info("Submitted time of request with ID {} is {} hours later than before.", pendingRequest.getHearingId(), exceptionLimitInHours); result = true; } @@ -83,7 +83,7 @@ public boolean lastTriedDateTimePeriodElapsed(PendingRequestEntity pendingReques long minutesElapsed = ChronoUnit.MINUTES.between(lastTriedDateTime, LocalDateTime.now()); boolean result = retryLimitInMinutes < minutesElapsed; - log.debug("lastTriedDateTimePeriodNotElapsed()={} retryLimitInMinutes<{}> hearingId<{}> Minutes elapsed<{}> " + log.info("lastTriedDateTimePeriodNotElapsed()={} retryLimitInMinutes<{}> hearingId<{}> Minutes elapsed<{}> " + "submittedDateTime<{}> currentDateTime<{}>", result, retryLimitInMinutes, pendingRequest.getHearingId(), minutesElapsed, lastTriedDateTime, LocalDateTime.now()); @@ -93,7 +93,7 @@ public boolean lastTriedDateTimePeriodElapsed(PendingRequestEntity pendingReques public List findAndLockByHearingId(Long hearingId) { List lockedRequests = pendingRequestRepository.findAndLockByHearingId(hearingId); - log.debug( + log.info( "{} locked records = findAndLockByHearingId({})", null == lockedRequests ? 0 : lockedRequests.size(), hearingId @@ -107,7 +107,7 @@ public List findQueuedPendingRequestsForProcessing() { getIntervalUnits(pendingWaitInterval), getIntervalMeasure(pendingWaitInterval)); if (!pendingRequests.isEmpty()) { pendingRequests.forEach(e -> - log.debug("findQueuedPendingRequestsForProcessing(): id<{}> hearingId<{}> ", + log.info("findQueuedPendingRequestsForProcessing(): id<{}> hearingId<{}> ", e.getId(), e.getHearingId())); } else { log.debug("findQueuedPendingRequestsForProcessing(): empty"); @@ -124,7 +124,7 @@ public void markRequestAsPending(Long id, Integer retryCountIn, LocalDateTime la } public void markRequestWithGivenStatus(Long id, String status) { - log.debug("markRequestWithGivenStatus({}, {})", id, status); + log.info("markRequestWithGivenStatus({}, {})", id, status); pendingRequestRepository.markRequestWithGivenStatus(id, status); } @@ -151,7 +151,7 @@ public void catchExceptionAndUpdateHearing(Long hearingId, Exception exception) } public void escalatePendingRequests() { - log.debug("escalatePendingRequests()"); + log.info("escalatePendingRequests()"); try { List pendingRequests = @@ -165,7 +165,7 @@ public void escalatePendingRequests() { } public void deleteCompletedPendingRequests() { - log.debug("deleteCompletedPendingRequests({})", deletionWaitInterval); + log.info("deleteCompletedPendingRequests({})", deletionWaitInterval); try { int countOfDeletedRecords = pendingRequestRepository.deleteCompletedRecords( getIntervalUnits(deletionWaitInterval), getIntervalMeasure(deletionWaitInterval)); @@ -176,7 +176,7 @@ public void deleteCompletedPendingRequests() { } protected void escalatePendingRequest(PendingRequestEntity pendingRequest) { - log.debug("escalatePendingRequests"); + log.info("escalatePendingRequests"); pendingRequestRepository.markRequestForEscalation(pendingRequest.getId(), LocalDateTime.now()); log.error("Error occurred during service bus processing. Service:{}. Entity:{}. Method:{}. Hearing ID:{}.", From 66a2892330f3c4d28009303b34f45b7c1bff2e0e Mon Sep 17 00:00:00 2001 From: RebeccaBaker <38425793+RebeccaBaker@users.noreply.github.com> Date: Thu, 1 May 2025 08:48:39 +0100 Subject: [PATCH 2/3] Update application.yaml --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 74d8c852..a387791d 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -88,7 +88,7 @@ LOGGING: gov: hmcts: reform: - hmc: DEBUG + hmc: INFO logging: level: From ec5f698747b056db8a328cf0438e92fead48302b Mon Sep 17 00:00:00 2001 From: RebeccaBaker <38425793+RebeccaBaker@users.noreply.github.com> Date: Thu, 1 May 2025 08:49:45 +0100 Subject: [PATCH 3/3] Update PendingRequestServiceImpl.java --- .../gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java index 2fa6ebd7..147427ae 100644 --- a/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/reform/hmc/service/PendingRequestServiceImpl.java @@ -67,7 +67,7 @@ public boolean submittedDateTimePeriodElapsed(PendingRequestEntity pendingReques log.info("Marking hearing request {} as Exception (hours elapsed exceeds limit!)", pendingRequest.getHearingId()); markRequestWithGivenStatus(pendingRequest.getId(), PendingStatusType.EXCEPTION.name()); - log.info("Submitted time of request with ID {} is {} hours later than before.", + log.error("Submitted time of request with ID {} is {} hours later than before.", pendingRequest.getHearingId(), exceptionLimitInHours); result = true; }