Merge pull request #269 from seart-group/enhancement/log

seart-group · Dec 31, 2023 · 9946598 · 9946598
2 parents 593bb6c + c6094d9
commit 9946598
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/main/java/ch/usi/si/seart/job/CleanUpProjectsJob.java b/src/main/java/ch/usi/si/seart/job/CleanUpProjectsJob.java
@@ -1,5 +1,6 @@
 package ch.usi.si.seart.job;
 
+import ch.usi.si.seart.config.properties.CleanUpProperties;
 import ch.usi.si.seart.exception.ClientURLException;
 import ch.usi.si.seart.exception.git.GitException;
 import ch.usi.si.seart.git.GitConnector;
@@ -13,11 +14,15 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.TriggerContext;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.scheduling.support.SimpleTriggerContext;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Date;
 
 @Job
 @Slf4j
@@ -26,6 +31,8 @@
 @AllArgsConstructor(onConstructor_ = @Autowired)
 public class CleanUpProjectsJob implements Runnable {
 
+    CleanUpProperties cleanUpProperties;
+
     GitConnector gitConnector;
     ClientURLConnector curlConnector;
 
@@ -35,7 +42,7 @@ public class CleanUpProjectsJob implements Runnable {
     @Scheduled(cron = "${ghs.clean-up.cron}")
     public void run() {
         log.info(
-                "Started cleanup  on {}/{} repositories",
+                "Started cleanup on {}/{} repositories",
                 gitRepoService.countCleanupCandidates(),
                 gitRepoService.count()
         );
@@ -50,6 +57,10 @@ public void run() {
                 gitRepoService.pingById(id);
             }
         });
+        CronTrigger trigger = cleanUpProperties.getCron();
+        TriggerContext context = new SimpleTriggerContext();
+        Date date = trigger.nextExecutionTime(context);
+        log.info("Next cleanup scheduled for: {}", date);
     }
 
     /*

diff --git a/src/main/java/ch/usi/si/seart/job/CodeAnalysisJob.java b/src/main/java/ch/usi/si/seart/job/CodeAnalysisJob.java
@@ -1,6 +1,7 @@
 package ch.usi.si.seart.job;
 
 import ch.usi.si.seart.analysis.CLOCConnector;
+import ch.usi.si.seart.config.properties.AnalysisProperties;
 import ch.usi.si.seart.exception.StaticCodeAnalysisException;
 import ch.usi.si.seart.exception.git.GitException;
 import ch.usi.si.seart.exception.git.RepositoryDisabledException;
@@ -35,6 +36,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Path;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -47,6 +51,8 @@ public class CodeAnalysisJob implements Runnable {
 
     ApplicationContext applicationContext;
 
+    AnalysisProperties analysisProperties;
+
     GitConnector gitConnector;
     CLOCConnector clocConnector;
 
@@ -63,6 +69,9 @@ public void run() {
                 gitRepoService.count()
         );
         gitRepoService.streamAnalysisCandidates().forEach(this::analyze);
+        Duration delay = analysisProperties.getDelayBetweenRuns();
+        Instant instant = Instant.now().plus(delay);
+        log.info("Next analysis scheduled for: {}", Date.from(instant));
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)

diff --git a/src/main/java/ch/usi/si/seart/job/CrawlProjectsJob.java b/src/main/java/ch/usi/si/seart/job/CrawlProjectsJob.java
@@ -87,9 +87,9 @@ public void run() {
             Range<Date> dateRange = Ranges.closed(lower, upper);
             crawlRepositories(dateRange, language);
         }
-        Duration delayBetweenRuns = crawlerProperties.getDelayBetweenRuns();
-        Instant nextRun = Instant.now().plus(delayBetweenRuns);
-        log.info("Next crawl scheduled for: {}", Date.from(nextRun));
+        Duration delay = crawlerProperties.getDelayBetweenRuns();
+        Instant instant = Instant.now().plus(delay);
+        log.info("Next crawl scheduled for: {}", Date.from(instant));
     }
 
     private void crawlRepositories(Range<Date> range, Language language) {