[git] improve start end stop

Author: FrogDevelopper

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/git/GitCleanUp.java

@@ -10,6 +10,7 @@
 import org.apache.commons.io.FileUtils;
 
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.annotation.Blocking;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.runtime.event.annotation.EventListener;
 import io.micronaut.runtime.server.event.ServerShutdownEvent;
@@ -35,6 +36,7 @@ public class GitCleanUp {
      *
      * @param ignored the server shutdown event
      */
+    @Blocking
     @EventListener
     public void onServerShutdownEvent(final ServerShutdownEvent ignored) {
         try {

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/git/GitImportJob.java

@@ -3,11 +3,14 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 
 import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
 
 import com.frogdevelopment.consul.populate.PopulateService;
 
@@ -32,7 +35,10 @@ public class GitImportJob {
     private final TaskScheduler taskScheduler;
     private final Git git;
 
-    public void init() throws GitAPIException {
+    private final AtomicReference<ScheduledFuture<?>> scheduledFutureRef = new AtomicReference<>();
+    private final AtomicBoolean stopping = new AtomicBoolean(false);
+
+    public void start() {
         log.info("Populating Consul with repository");
         populateService.populate();
 
@@ -50,10 +56,15 @@ private void listenForRepositoryChanges() {
 
         final var polling = gitProperties.getPolling();
         log.debug("Scheduling pull command with fixed delay={}", polling.getDelay());
-        taskScheduler.scheduleWithFixedDelay(polling.getDelay(), polling.getDelay(), this::pull);
+        final var scheduledFuture = taskScheduler.scheduleWithFixedDelay(polling.getDelay(), polling.getDelay(), this::pull);
+        scheduledFutureRef.set(scheduledFuture);
     }
 
     private void pull() {
+        if (stopping.get()) {
+            log.debug("Job stopped, skipping polling");
+            return;
+        }
         try {
             log.debug("Pull repository");
             final var result = git.pull()
@@ -63,4 +74,15 @@ private void pull() {
             log.error("Scheduled task encountered an error. Please check logs", e);
         }
     }
+
+    public void stop() {
+        if (gitProperties.getPolling().isEnabled()) {
+            log.info("Stoping polling job");
+            stopping.set(true);
+            final var scheduledFuture = scheduledFutureRef.get();
+            if (scheduledFuture != null) {
+                scheduledFuture.cancel(true);
+            }
+        }
+    }
 }

consul-populate-core/src/main/java/com/frogdevelopment/consul/populate/git/ServerEventsListener.java

@@ -0,0 +1,32 @@
+package com.frogdevelopment.consul.populate.git;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import jakarta.inject.Singleton;
+
+import io.micronaut.core.annotation.Blocking;
+import io.micronaut.runtime.event.annotation.EventListener;
+import io.micronaut.runtime.server.event.ServerShutdownEvent;
+import io.micronaut.runtime.server.event.ServerStartupEvent;
+import io.micronaut.scheduling.annotation.Async;
+
+@Slf4j
+@Singleton
+@RequiredArgsConstructor
+public class ServerEventsListener {
+
+    private final GitImportJob gitImportJob;
+
+    @Async
+    @EventListener
+    public void onServerStartupEvent(final ServerStartupEvent ignored) {
+        gitImportJob.start();
+    }
+
+    @Blocking
+    @EventListener
+    public void onServerShutdownEvent(final ServerShutdownEvent ignored) {
+        gitImportJob.stop();
+    }
+}