Added logs for MonitoringService
This commit is contained in:
parent
8938a99165
commit
78d7929342
1 changed files with 13 additions and 0 deletions
|
|
@ -56,11 +56,14 @@ public class MonitoringService {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void monitor() {
|
private void monitor() {
|
||||||
|
log.info("Start monitoring");
|
||||||
List<PackageData> packages = signalService.findPackagesOnMonitoring();
|
List<PackageData> packages = signalService.findPackagesOnMonitoring();
|
||||||
for (PackageData packageData : packages) {
|
for (PackageData packageData : packages) {
|
||||||
|
log.info("Processing package {}", packageData.getPackageName());
|
||||||
SgnlOnlineReport onlineReports = signalRestService.getReports(packageData.getUserId().substring(0, 6) + "_" + packageData.getPackageName());
|
SgnlOnlineReport onlineReports = signalRestService.getReports(packageData.getUserId().substring(0, 6) + "_" + packageData.getPackageName());
|
||||||
|
|
||||||
if (onlineReports == null) {
|
if (onlineReports == null) {
|
||||||
|
log.info("No reports found for package {}", packageData.getPackageName());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -73,6 +76,12 @@ public class MonitoringService {
|
||||||
|
|
||||||
LocalDateTime lastDownloadedReportDate = CTUtil.parseDateFromReportFileName(packageData.getLastDownloadedReport());
|
LocalDateTime lastDownloadedReportDate = CTUtil.parseDateFromReportFileName(packageData.getLastDownloadedReport());
|
||||||
|
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
OnlineDownloadReport report = null;
|
OnlineDownloadReport report = null;
|
||||||
if (packageData.getLastDownloadedReport() == null && newReport.isPresent()) {
|
if (packageData.getLastDownloadedReport() == null && newReport.isPresent()) {
|
||||||
report = loadReport(newReport.get()); // по этому пакету еще не было загруженных отчетов, продолжаем работу с полученным
|
report = loadReport(newReport.get()); // по этому пакету еще не было загруженных отчетов, продолжаем работу с полученным
|
||||||
|
|
@ -83,12 +92,14 @@ public class MonitoringService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (report == null) {
|
if (report == null) {
|
||||||
|
log.info("Report loaded for package {}, Report name {}", packageData.getPackageName(), newReport.get());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
MonitoringSignalResponse response = generateResponse(packageData, report.getPersons().getPersons());
|
MonitoringSignalResponse response = generateResponse(packageData, report.getPersons().getPersons());
|
||||||
String fileName = createResponseFile(packageData, response);
|
String fileName = createResponseFile(packageData, response);
|
||||||
if (fileName != null) {
|
if (fileName != null) {
|
||||||
|
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());
|
||||||
}
|
}
|
||||||
|
|
@ -161,6 +172,7 @@ public class MonitoringService {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateSignalHits(PackageData packageData, MonitoringSignalResponse response, String reportFileName) {
|
private void updateSignalHits(PackageData packageData, MonitoringSignalResponse response, String reportFileName) {
|
||||||
|
log.info("Updating signal hits for {}", packageData.getPackageName());
|
||||||
LocalDateTime responseSentAt = LocalDateTime.now();
|
LocalDateTime responseSentAt = LocalDateTime.now();
|
||||||
List<HitsData> hits = new ArrayList<>();
|
List<HitsData> hits = new ArrayList<>();
|
||||||
response.getSubjects().getSubjects().forEach(subject -> {
|
response.getSubjects().getSubjects().forEach(subject -> {
|
||||||
|
|
@ -175,6 +187,7 @@ public class MonitoringService {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
signalService.setHits(hits);
|
signalService.setHits(hits);
|
||||||
|
log.info("Signal hits updated for package {}", packageData.getPackageName());
|
||||||
}
|
}
|
||||||
|
|
||||||
private OnlineDownloadReport loadReport(String reportName) {
|
private OnlineDownloadReport loadReport(String reportName) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue