Merge pull request #492 from amaximus/bugfix/JENKINS-71645

[JENKINS-71645] Fix Project list fetch interval parameter
jenkinsci · Jul 17, 2023 · 7de6104 · 7de6104
2 parents 475e265 + fef9094
commit 7de6104
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritProjectListUpdater.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/GerritProjectListUpdater.java
@@ -100,7 +100,7 @@ public int getTimerUpdatePeriod() {
      */
     public void setTimerUpdatePeriod(int timerUpdatePeriod) {
         this.timerUpdatePeriod = timerUpdatePeriod;
-        scheduleProjectListUpdate(0);
+        scheduleProjectListUpdate(0, timerUpdatePeriod);
     }
 
     /**
@@ -180,7 +180,8 @@ public void initProjectListUpdater() {
                 return;
             }
             timer = new Timer(serverName);
-            scheduleProjectListUpdate(getConfig().getProjectListFetchDelay());
+            scheduleProjectListUpdate(getConfig().getProjectListFetchDelay(),
+                                      getConfig().getProjectListRefreshInterval());
         } else {
             logger.error("Can't create two timers for the same Gerrit instance: " + serverName);
         }
@@ -207,8 +208,9 @@ public void cancelProjectListUpdater() {
      * This method creates a timer that schedule the update of the gerrit project list.
      *
      * @param initDelay the initial delay, in seconds.
+     * @param updatePeriod the update period, in seconds.
      */
-    public void scheduleProjectListUpdate(int initDelay) {
+    public void scheduleProjectListUpdate(int initDelay, int updatePeriod) {
         logger.info("Start timer to update project list");
         if (timer != null) {
             timer.cancel();
@@ -218,7 +220,7 @@ public void scheduleProjectListUpdate(int initDelay) {
                 public void run() {
                     tryLoadProjectList();
                 }
-            }, TimeUnit.SECONDS.toMillis(initDelay), TimeUnit.MINUTES.toMillis(timerUpdatePeriod));
+            }, TimeUnit.SECONDS.toMillis(initDelay), TimeUnit.MINUTES.toMillis(updatePeriod));
         } else {
             logger.error("Unable to schedule project list update task because timer is null");
         }