Move waiting for next reaction to start into its own method.

[rhynodge.git] / src / main / java / net / pterodactylus / rhynodge / engine / Engine.java

diff --git a/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java b/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java
index 423eaaf..bb42289 100644 (file)
--- a/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java
+++ b/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java
@@ -122,19 +122,11 @@ public class Engine extends AbstractExecutionThreadService {
 
                        /* wait until the next reaction has to run. */
                        Optional<net.pterodactylus.rhynodge.State> lastState = stateManager.loadLastState(reactionName);
-                       long lastStateTime = lastState.isPresent() ? lastState.get().time() : 0;
                        int lastStateFailCount = lastState.isPresent() ? lastState.get().failCount() : 0;
-                       long waitTime = (lastStateTime + nextReaction.get().getReaction().updateInterval()) - System.currentTimeMillis();
+                       long waitTime = nextReaction.get().getNextTime() - System.currentTimeMillis();
                        logger.debug(format("Time to wait for next Reaction: %d millseconds.", waitTime));
                        if (waitTime > 0) {
-                               synchronized (reactions) {
-                                       try {
-                                               logger.info(format("Waiting until %tc.", lastStateTime + nextReaction.get().getReaction().updateInterval()));
-                                               reactions.wait(waitTime);
-                                       } catch (InterruptedException ie1) {
-                                               /* we’re looping! */
-                                       }
-                               }
+                               waitForNextReactionToStart(nextReaction, waitTime);
 
                                /* re-start loop to check for new reactions. */
                                continue;
@@ -197,6 +189,17 @@ public class Engine extends AbstractExecutionThreadService {
                }
        }
 
+       private void waitForNextReactionToStart(Optional<NextReaction> nextReaction, long waitTime) {
+               synchronized (reactions) {
+                       try {
+                               logger.info(format("Waiting until %tc.", nextReaction.get().getNextTime()));
+                               reactions.wait(waitTime);
+                       } catch (InterruptedException ie1) {
+                               /* we’re looping! */
+                       }
+               }
+       }
+
        private Optional<NextReaction> getNextReaction() {
                while (isRunning()) {
                        synchronized (reactions) {