fix version check debug code

Author: jrivard

server/src/main/java/password/pwm/svc/version/VersionCheckService.java

@@ -161,36 +161,35 @@ private void scheduleNextCheck()
             return;
         }
 
-        this.nextScheduledCheck = Instant.now().plus( 1, ChronoUnit.MINUTES );
-        executorService.schedule( new PeriodicCheck(), 1, TimeUnit.MINUTES );
-
-        /*
         final VersionCheckInfoCache localCache = cacheHolder.getVersionCheckInfoCache();
 
+        this.nextScheduledCheck = calculateNextScheduledCheck( localCache, settings );
+
+        final TimeDuration delayUntilNextExecution = TimeDuration.fromCurrent( this.nextScheduledCheck );
+
+        executorService.schedule( new PeriodicCheck(), delayUntilNextExecution.asMillis(), TimeUnit.MILLISECONDS );
+
+        LOGGER.trace( SessionLabel.VERSIONCHECK_SESSION_LABEL, () -> "scheduled next check execution at " + JavaHelper.toIsoDate( nextScheduledCheck )
+                + " in " + delayUntilNextExecution.asCompactString() );
+    }
+
+    private static Instant calculateNextScheduledCheck( final VersionCheckInfoCache localCache, final VersionCheckSettings settings )
+    {
         final TimeDuration idealDurationUntilNextCheck = localCache.getLastError() != null && localCache.getCurrentVersion() == null
                 ? settings.getCheckIntervalError()
                 : settings.getCheckInterval();
 
         if ( localCache.getLastCheckTimestamp() == null )
         {
-            this.nextScheduledCheck = Instant.now().plus( 10, ChronoUnit.SECONDS );
+            return Instant.now().plus( 10, ChronoUnit.SECONDS );
         }
         else
         {
             final Instant nextIdealTimestamp = localCache.getLastCheckTimestamp().plus( idealDurationUntilNextCheck.asDuration() );
-            this.nextScheduledCheck = nextIdealTimestamp.isBefore( Instant.now() )
+            return nextIdealTimestamp.isBefore( Instant.now() )
                     ? Instant.now().plus( 10, ChronoUnit.SECONDS )
                     : nextIdealTimestamp;
         }
-
-        final TimeDuration delayUntilNextExecution = TimeDuration.fromCurrent( this.nextScheduledCheck );
-
-        executorService.schedule( new PeriodicCheck(), delayUntilNextExecution.asMillis(), TimeUnit.MILLISECONDS );
-
-        LOGGER.trace( SessionLabel.VERSIONCHECK_SESSION_LABEL, () -> "scheduled next check execution at " + JavaHelper.toIsoDate( nextScheduledCheck )
-                + " in " + delayUntilNextExecution.asCompactString() );
-
-         */
     }
 
     private class PeriodicCheck implements Runnable