diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/repository/impl/AuditIniRetentionRepo.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/repository/impl/AuditIniRetentionRepo.java index d385c39..3c4b0af 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/repository/impl/AuditIniRetentionRepo.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/repository/impl/AuditIniRetentionRepo.java @@ -4,6 +4,7 @@ import it.finanze.sanita.fse2.ms.gtw.garbage.repository.entity.AuditIniETY; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.core.MongoTemplate; @@ -21,9 +22,12 @@ public class AuditIniRetentionRepo implements IAuditIniRetentionRepo { @Autowired private MongoTemplate mongoTemplate; + @Value("${retention.transactions-query.limit}") + private Integer retentionQueryLimit; + @Override public void deleteExpiredAudit(Date date) { - Pageable pageable = PageRequest.of(0, 100); + Pageable pageable = PageRequest.of(0, retentionQueryLimit); Query query = new Query(Criteria.where(AuditIniETY.EXPIRING_DATE).lte(date)).with(pageable); List audits; @@ -42,11 +46,11 @@ public void deleteExpiredAudit(Date date) { pageable = pageable.next(); query.with(pageable); - log.debug("{} records has been deleted in the current batch", deletedInBatch); + log.info("{} records has been deleted in the current batch", deletedInBatch); } while (!audits.isEmpty()); - log.debug("Total records deleted: {}", totalDeleted); + log.info("Total records deleted: {}", totalDeleted); } diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/scheduler/AuditIniRetentionScheduler.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/scheduler/AuditIniRetentionScheduler.java index bece4bc..10b861c 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/scheduler/AuditIniRetentionScheduler.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/garbage/scheduler/AuditIniRetentionScheduler.java @@ -27,7 +27,7 @@ public void action() { public void run() { log.debug("Audit-ini Retention Scheduler - Retention Scheduler starting"); try { - log.debug("Checking for expired ini audit..."); + log.info("Checking for expired ini audit..."); auditIniRetentionSRV.deleteAudit(new Date()); } catch (Exception e) { log.warn("Audit-ini Scheduler - Error while executing audit-ini data retention", e);