Change logging for MonitoringService; Minor fix
This commit is contained in:
parent
1507705380
commit
307f43f49b
1 changed files with 10 additions and 3 deletions
|
|
@ -70,13 +70,18 @@ public class MonitoringService {
|
||||||
List<String> fileNames = onlineReports.getOperationReport().getReports().getReports().stream().map(Report::getFilename)
|
List<String> fileNames = onlineReports.getOperationReport().getReports().getReports().stream().map(Report::getFilename)
|
||||||
.filter(fileName -> CTUtil.parseDateFromReportFileName(fileName) != null).toList(); // TODO оптимизировать
|
.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)
|
Optional<String> newReport = Optional.of(fileNames)
|
||||||
.orElseGet(Collections::emptyList)
|
.orElseGet(Collections::emptyList)
|
||||||
.stream().max(Comparator.comparing(CTUtil::parseDateFromReportFileName)); // отфильтровали только те имена, которые парсятся в дату, так что null тут не придет
|
.stream().max(Comparator.comparing(CTUtil::parseDateFromReportFileName)); // отфильтровали только те имена, которые парсятся в дату, так что null тут не придет
|
||||||
|
|
||||||
LocalDateTime lastDownloadedReportDate = CTUtil.parseDateFromReportFileName(packageData.getLastDownloadedReport());
|
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());
|
log.info("Last downloaded report found for package {}. Last Downloaded Report Name: {}", packageData.getPackageName(), packageData.getLastDownloadedReport());
|
||||||
} else {
|
} else {
|
||||||
log.info("Last Downloaded Report Name is empty");
|
log.info("Last Downloaded Report Name is empty");
|
||||||
|
|
@ -92,7 +97,7 @@ public class MonitoringService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (report == null) {
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,6 +107,8 @@ public class MonitoringService {
|
||||||
log.info("New report fileName: {}", fileName);
|
log.info("New report fileName: {}", fileName);
|
||||||
updateSignalHits(packageData, response, fileName);
|
updateSignalHits(packageData, response, fileName);
|
||||||
signalService.updateLastDownloadedReport(packageData.getId(), newReport.get());
|
signalService.updateLastDownloadedReport(packageData.getId(), newReport.get());
|
||||||
|
} else {
|
||||||
|
log.info("Report was not created for package {}", packageData.getPackageName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.info("Finish monitoring");
|
log.info("Finish monitoring");
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue