diff --git a/src/main/java/org/gcube/accounting/aggregator/aggregation/Aggregator.java b/src/main/java/org/gcube/accounting/aggregator/aggregation/Aggregator.java index 83d91b6..0a5be60 100644 --- a/src/main/java/org/gcube/accounting/aggregator/aggregation/Aggregator.java +++ b/src/main/java/org/gcube/accounting/aggregator/aggregation/Aggregator.java @@ -200,8 +200,7 @@ public class Aggregator { aggregateRecordsBackupFileTmp.renameTo(aggregateRecordsBackupFile); - aggregationStatus.setRecordNumbers(originalRecordsCounter, aggregatedRecords.size()); - aggregationStatus.setMalformedRecordNumber(malformedRecordNumber); + aggregationStatus.setRecordNumbers(originalRecordsCounter, aggregatedRecords.size(), malformedRecordNumber); aggregationStatus.setState(AggregationState.AGGREGATED, startTime, true); } diff --git a/src/main/java/org/gcube/accounting/aggregator/status/AggregationStatus.java b/src/main/java/org/gcube/accounting/aggregator/status/AggregationStatus.java index 7a3ac5a..71890a1 100644 --- a/src/main/java/org/gcube/accounting/aggregator/status/AggregationStatus.java +++ b/src/main/java/org/gcube/accounting/aggregator/status/AggregationStatus.java @@ -108,11 +108,12 @@ public class AggregationStatus { } } - public void setRecordNumbers(int originalRecordsNumber, int aggregatedRecordsNumber) { + public void setRecordNumbers(int originalRecordsNumber, int aggregatedRecordsNumber, int malformedRecordNumber) { this.recoveredRecordNumber = originalRecordsNumber - aggregatedRecordsNumber; this.percentage = originalRecordsNumber!=0 ? (100 * recoveredRecordNumber) / originalRecordsNumber : 0; - logger.info("Original records are {}. Aggregated records are {}. Difference {}. We recover {}% of Documents", - originalRecordsNumber, aggregatedRecordsNumber, recoveredRecordNumber, percentage); + logger.info("Original records are {} ({} were malformed). Aggregated records are {}. Difference {}. We recover {}% of Documents", + originalRecordsNumber, malformedRecordNumber, aggregatedRecordsNumber, recoveredRecordNumber, percentage); + this.malformedRecordNumber = malformedRecordNumber; this.originalRecordsNumber = originalRecordsNumber; this.aggregatedRecordsNumber = aggregatedRecordsNumber; }