X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fengine%2FEngine.java;h=bb422896febe80b7c97452b63912dcc87edeb1a6;hb=078ecb834e21239ec0dc17b57a29a4efa9eede66;hp=ddc3be94dd690fd73a3f0e0f508c05572187bbb9;hpb=dd8ba86c50ea2655b1a0ac288b06495b7cb368c4;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java b/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java
index ddc3be9..bb42289 100644
--- a/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java
+++ b/src/main/java/net/pterodactylus/rhynodge/engine/Engine.java
@@ -30,14 +30,12 @@ import java.util.SortedMap;
 import net.pterodactylus.rhynodge.Filter;
 import net.pterodactylus.rhynodge.Query;
 import net.pterodactylus.rhynodge.Reaction;
-import net.pterodactylus.rhynodge.State;
 import net.pterodactylus.rhynodge.Trigger;
 import net.pterodactylus.rhynodge.states.AbstractState;
 import net.pterodactylus.rhynodge.states.FailedState;
 import net.pterodactylus.rhynodge.states.StateManager;
 
 import com.google.common.base.Optional;
-import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.log4j.Logger;
@@ -114,29 +112,21 @@ public class Engine extends AbstractExecutionThreadService {
 	@Override
 	public void run() {
 		while (isRunning()) {
-			Optional<Pair<String, Reaction>> nextReaction = getNextReaction();
+			Optional<NextReaction> nextReaction = getNextReaction();
 			if (!nextReaction.isPresent()) {
 				continue;
 			}
 
-			String reactionName = nextReaction.get().getLeft();
+			String reactionName = nextReaction.get().getKey();
 			logger.debug(format("Next Reaction: %s.", reactionName));
 
 			/* 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().getRight().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().getRight().updateInterval()));
-						reactions.wait(waitTime);
-					} catch (InterruptedException ie1) {
-						/* we’re looping! */
-					}
-				}
+				waitForNextReactionToStart(nextReaction, waitTime);
 
 				/* re-start loop to check for new reactions. */
 				continue;
@@ -144,7 +134,7 @@ public class Engine extends AbstractExecutionThreadService {
 
 			/* run reaction. */
 			logger.info(format("Running Query for %s...", reactionName));
-			Query query = nextReaction.get().getRight().query();
+			Query query = nextReaction.get().getReaction().query();
 			net.pterodactylus.rhynodge.State state;
 			try {
 				logger.debug("Querying system...");
@@ -162,7 +152,7 @@ public class Engine extends AbstractExecutionThreadService {
 			logger.debug(format("State is %s.", state));
 
 			/* convert states. */
-			for (Filter filter : nextReaction.get().getRight().filters()) {
+			for (Filter filter : nextReaction.get().getReaction().filters()) {
 				if (state.success()) {
 					net.pterodactylus.rhynodge.State newState = filter.filter(state);
 					//logger.debug(String.format("Old state is %s, new state is %s.", state, newState));
@@ -176,7 +166,7 @@ public class Engine extends AbstractExecutionThreadService {
 
 			/* merge states. */
 			boolean triggerHit = false;
-			Trigger trigger = nextReaction.get().getRight().trigger();
+			Trigger trigger = nextReaction.get().getReaction().trigger();
 			if (lastSuccessfulState.isPresent() && lastSuccessfulState.get().success() && state.success()) {
 				net.pterodactylus.rhynodge.State newState = trigger.mergeStates(lastSuccessfulState.get(), state);
 
@@ -193,13 +183,24 @@ public class Engine extends AbstractExecutionThreadService {
 			logger.debug(format("Trigger was hit: %s.", triggerHit));
 			if (triggerHit) {
 				logger.info("Executing Action...");
-				nextReaction.get().getRight().action().execute(trigger.output(nextReaction.get().getRight()));
+				nextReaction.get().getReaction().action().execute(trigger.output(nextReaction.get().getReaction()));
 			}
 
 		}
 	}
 
-	private Optional<Pair<String, Reaction>> getNextReaction() {
+	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) {
 				if (reactions.isEmpty()) {
@@ -221,10 +222,37 @@ public class Engine extends AbstractExecutionThreadService {
 					long stateTime = state.isPresent() ? state.get().time() : 0;
 					nextReactions.put(stateTime + reactionEntry.getValue().updateInterval(), Pair.of(reactionEntry.getKey(), reactionEntry.getValue()));
 				}
-				return of(nextReactions.get(nextReactions.firstKey()));
+				Pair<String, Reaction> keyReaction = nextReactions.get(nextReactions.firstKey());
+				return of(new NextReaction(keyReaction.getKey(), keyReaction.getValue(), nextReactions.firstKey()));
 			}
 		}
 		return absent();
 	}
 
+	private static class NextReaction {
+
+		private final String key;
+		private final Reaction reaction;
+		private final long nextTime;
+
+		private NextReaction(String key, Reaction reaction, long nextTime) {
+			this.key = key;
+			this.reaction = reaction;
+			this.nextTime = nextTime;
+		}
+
+		public String getKey() {
+			return key;
+		}
+
+		public Reaction getReaction() {
+			return reaction;
+		}
+
+		public long getNextTime() {
+			return nextTime;
+		}
+
+	}
+
 }