X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Freactor%2Fengine%2FEngine.java;h=2825b5492c017acbbeb5c802ced37eb7e50a78db;hb=67c416770e847c09df106b31d03c9227e738a429;hp=74b01b1226a6219585e3b297f67b46c4392b9e94;hpb=a4a82f14d760074339ef88c1245a88f6edf4cde8;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/reactor/engine/Engine.java b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
index 74b01b1..2825b54 100644
--- a/src/main/java/net/pterodactylus/reactor/engine/Engine.java
+++ b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
@@ -64,15 +64,9 @@ public class Engine extends AbstractExecutionThreadService {
 	 *            The name of the reaction
 	 * @param reaction
 	 *            The reaction to add to this engine
-	 * @throws IllegalStateException
-	 *             if the engine already contains a {@link Reaction} with the
-	 *             given name
 	 */
 	public void addReaction(String name, Reaction reaction) {
 		synchronized (reactions) {
-			if (reactions.containsKey(name)) {
-				throw new IllegalStateException(String.format("Engine already contains a Reaction named “%s!”", name));
-			}
 			reactions.put(name, reaction);
 			reactions.notifyAll();
 		}
@@ -124,7 +118,7 @@ public class Engine extends AbstractExecutionThreadService {
 			Reaction nextReaction;
 			synchronized (reactions) {
 				for (Entry<String, Reaction> reactionEntry : reactions.entrySet()) {
-					net.pterodactylus.reactor.State state = stateManager.loadState(reactionEntry.getKey());
+					net.pterodactylus.reactor.State state = stateManager.loadLastState(reactionEntry.getKey());
 					long stateTime = (state != null) ? state.time() : 0;
 					nextReactions.put(stateTime + reactionEntry.getValue().updateInterval(), Pair.of(reactionEntry.getKey(), reactionEntry.getValue()));
 				}
@@ -134,8 +128,9 @@ public class Engine extends AbstractExecutionThreadService {
 			logger.debug(String.format("Next Reaction: %s.", nextReaction));
 
 			/* wait until the next reaction has to run. */
-			net.pterodactylus.reactor.State lastState = stateManager.loadState(reactionName);
+			net.pterodactylus.reactor.State lastState = stateManager.loadLastState(reactionName);
 			long lastStateTime = (lastState != null) ? lastState.time() : 0;
+			int lastStateFailCount = (lastState != null) ? lastState.failCount() : 0;
 			long waitTime = (lastStateTime + nextReaction.updateInterval()) - System.currentTimeMillis();
 			logger.debug(String.format("Time to wait for next Reaction: %d millseconds.", waitTime));
 			if (waitTime > 0) {
@@ -153,6 +148,7 @@ public class Engine extends AbstractExecutionThreadService {
 			}
 
 			/* run reaction. */
+			logger.info(String.format("Running Query for %s...", reactionName));
 			Query query = nextReaction.query();
 			net.pterodactylus.reactor.State state;
 			try {
@@ -178,16 +174,18 @@ public class Engine extends AbstractExecutionThreadService {
 					state = newState;
 				}
 			}
-			if (state.success()) {
-				stateManager.saveState(reactionName, state);
+			if (!state.success()) {
+				state.setFailCount(lastStateFailCount + 1);
 			}
+			net.pterodactylus.reactor.State lastSuccessfulState = stateManager.loadLastSuccessfulState(reactionName);
+			stateManager.saveState(reactionName, state);
 
-			/* only run trigger if we have collected two states. */
+			/* only run trigger if we have collected two successful states. */
 			Trigger trigger = nextReaction.trigger();
 			boolean triggerHit = false;
-			if ((lastState != null) && state.success()) {
+			if ((lastSuccessfulState != null) && lastSuccessfulState.success() && state.success()) {
 				logger.debug("Checking Trigger for changes...");
-				triggerHit = trigger.triggers(state, lastState);
+				triggerHit = trigger.triggers(state, lastSuccessfulState);
 			}
 
 			/* run action if trigger was hit. */