X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fengine%2FReactionRunner.java;h=e658f1b7d59a00d9c1a29036441f50cbb5ed6abe;hb=48da379d3e08c7eb76550598f3b4dd9e637060d7;hp=ac04543ef4dbb18e6ab83782e9cbc70b8f3181c6;hpb=7a62280f42b7430279b8fd1b5818ddf0e7530b2a;p=rhynodge.git diff --git a/src/main/java/net/pterodactylus/rhynodge/engine/ReactionRunner.java b/src/main/java/net/pterodactylus/rhynodge/engine/ReactionRunner.java index ac04543..e658f1b 100644 --- a/src/main/java/net/pterodactylus/rhynodge/engine/ReactionRunner.java +++ b/src/main/java/net/pterodactylus/rhynodge/engine/ReactionRunner.java @@ -48,7 +48,7 @@ public class ReactionRunner implements Runnable { State state = runQuery(); state = runStateThroughFilters(state); if (!state.success()) { - logger.info(format("Reaction %s failed.", reaction.name())); + logger.info(format("Reaction %s failed in %s.", reaction.name(), state)); saveStateWithIncreasedFailCount(state); errorEmailAction.execute(createErrorOutput(reaction, state)); return; @@ -77,14 +77,14 @@ public class ReactionRunner implements Runnable { private Output createErrorOutput(Reaction reaction, State state) { DefaultOutput output = new DefaultOutput(String.format("Error while processing “%s!”", reaction.name())); - output.addText("text/plain; charset=utf-8", createErrorEmailText(reaction, state)); - output.addText("text/html; charset=utf-8", createErrorEmailText(reaction, state)); + output.addText("text/plain", createErrorEmailText(reaction, state)); + output.addText("text/html", createErrorEmailText(reaction, state)); return output; } private String createErrorEmailText(Reaction reaction, State state) { StringBuilder emailText = new StringBuilder(); - emailText.append(String.format("An error occured while processing “.”\n\n", reaction.name())); + emailText.append(String.format("An error occured while processing “%s.”\n\n", reaction.name())); appendExceptionToEmailText(state.exception(), emailText); return emailText.toString(); } @@ -120,7 +120,7 @@ public class ReactionRunner implements Runnable { try { currentState = filter.filter(currentState); if (currentState.success() && currentState.isEmpty()) { - errorEmailAction.execute(createEmptyStateOutput(reaction, state)); + errorEmailAction.execute(createEmptyStateOutput(reaction, currentState)); } } catch (Throwable t1) { logger.warn(format("Error during filter %s for %s.", filter.getClass().getSimpleName(), reaction.name()), t1); @@ -133,7 +133,7 @@ public class ReactionRunner implements Runnable { private Output createEmptyStateOutput(Reaction reaction, State state) { DefaultOutput defaultOutput = new DefaultOutput(String.format("Reached Empty State for “%s!”", reaction.name())); - defaultOutput.addText("text/plain; charset=utf-8", String.format("The %s for %s was empty.", state.getClass().getSimpleName(), reaction.name())); + defaultOutput.addText("text/plain", String.format("The %s for %s was empty.", state.getClass().getSimpleName(), reaction.name())); return defaultOutput; }