treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change logging for MonitoringService; Minor fix

Browse source
This commit is contained in:
Mikhail Trofimov 2025-06-30 17:50:13 +03:00
parent 1507705380
commit 307f43f49b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java
View file

@ -51,7 +51,7 @@ public class MonitoringService {
public void run() {
ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
long period = config.getMonitoringInterval() != null ? config.getMonitoringInterval() : 15;
long period = config.getMonitoringInterval() != null ? config.getMonitoringInterval() : 15;
scheduler.scheduleAtFixedRate(this::monitor, 0, period, TimeUnit.MINUTES);
}
@ -70,13 +70,18 @@ public class MonitoringService {
List<String> fileNames = onlineReports.getOperationReport().getReports().getReports().stream().map(Report::getFilename)
.filter(fileName -> CTUtil.parseDateFromReportFileName(fileName) != null).toList(); // TODO оптимизировать
if (fileNames.isEmpty()) {
log.info("No new report found for package {}", packageData.getPackageName());
continue;
}
Optional<String> newReport = Optional.of(fileNames)
.orElseGet(Collections::emptyList)
.stream().max(Comparator.comparing(CTUtil::parseDateFromReportFileName)); // отфильтровали только те имена, которые парсятся в дату, так что null тут не придет
LocalDateTime lastDownloadedReportDate = CTUtil.parseDateFromReportFileName(packageData.getLastDownloadedReport());
if(packageData.getLastDownloadedReport() != null) {
if (packageData.getLastDownloadedReport() != null) {
log.info("Last downloaded report found for package {}. Last Downloaded Report Name: {}", packageData.getPackageName(), packageData.getLastDownloadedReport());
} else {
log.info("Last Downloaded Report Name is empty");
@ -92,7 +97,7 @@ public class MonitoringService {
}
}
if (report == null) {
log.info("Report loaded for package {}, Report name {}", packageData.getPackageName(), newReport.get());
log.info("Report was not loaded for package {}", packageData.getPackageName());
continue;
}
@ -102,6 +107,8 @@ public class MonitoringService {
log.info("New report fileName: {}", fileName);
updateSignalHits(packageData, response, fileName);
signalService.updateLastDownloadedReport(packageData.getId(), newReport.get());
} else {
log.info("Report was not created for package {}", packageData.getPackageName());
}
}
log.info("Finish monitoring");