This commit is contained in:
@@ -90,7 +90,7 @@ public class MonitoringSearchService {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Error processing monitoring search", e);
|
log.error("Error processing monitoring search", e);
|
||||||
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
||||||
updateNextRun(monitoring);
|
monitoring.setNextRun(calculateNextRun(monitoringType));
|
||||||
|
|
||||||
monitoringRepository.save(monitoring);
|
monitoringRepository.save(monitoring);
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@ public class MonitoringSearchService {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
log.error("Error processing monitoring search", e);
|
log.error("Error processing monitoring search", e);
|
||||||
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
||||||
updateNextRun(monitoring);
|
monitoring.setNextRun(calculateNextRun(monitoringType));
|
||||||
|
|
||||||
monitoringRepository.save(monitoring);
|
monitoringRepository.save(monitoring);
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ public class MonitoringSearchService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
monitoring.setLastRunStatus("SUCCESS");
|
monitoring.setLastRunStatus("SUCCESS");
|
||||||
updateNextRun(monitoring);
|
monitoring.setNextRun(calculateNextRun(monitoringType));
|
||||||
monitoringRepository.save(monitoring);
|
monitoringRepository.save(monitoring);
|
||||||
} catch (TariffNotFoundException e) {
|
} catch (TariffNotFoundException e) {
|
||||||
TariffInfo activeTariffInfo = user.getActiveTariffInfo();
|
TariffInfo activeTariffInfo = user.getActiveTariffInfo();
|
||||||
@@ -147,7 +147,7 @@ public class MonitoringSearchService {
|
|||||||
|
|
||||||
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
||||||
|
|
||||||
updateNextRun(monitoring);
|
monitoring.setNextRun(calculateNextRun(monitoringType));
|
||||||
|
|
||||||
monitoringRepository.save(monitoring);
|
monitoringRepository.save(monitoring);
|
||||||
|
|
||||||
@@ -163,7 +163,7 @@ public class MonitoringSearchService {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error processing monitoring search", e);
|
log.error("Error processing monitoring search", e);
|
||||||
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
monitoring.setLastRunStatus("ERROR: " + e.getMessage());
|
||||||
updateNextRun(monitoring);
|
monitoring.setNextRun(calculateNextRun(monitoringType));
|
||||||
|
|
||||||
monitoringRepository.save(monitoring);
|
monitoringRepository.save(monitoring);
|
||||||
|
|
||||||
@@ -179,11 +179,6 @@ public class MonitoringSearchService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateNextRun(FileMonitoringEntity monitoring) {
|
|
||||||
LocalDateTime nextRun = calculateNextRun(monitoring.getMonitoringType());
|
|
||||||
monitoring.setNextRun(nextRun);
|
|
||||||
}
|
|
||||||
|
|
||||||
private LocalDateTime calculateNextRun(MonitoringType type) {
|
private LocalDateTime calculateNextRun(MonitoringType type) {
|
||||||
LocalDateTime now = LocalDateTime.now();
|
LocalDateTime now = LocalDateTime.now();
|
||||||
LocalDateTime nextRun = now.withHour(2).withMinute(0).withSecond(0).withNano(0);
|
LocalDateTime nextRun = now.withHour(2).withMinute(0).withSecond(0).withNano(0);
|
||||||
|
|||||||
Reference in New Issue
Block a user