Merge pull request #870 from HubSpot/handle-thread-interrupt

Handle thread interrupts by throwing an InterpretException
HubSpot · Jun 2, 2022 · 16684a6 · 16684a6
2 parents 673ad89 + f03bab9
commit 16684a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java b/src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java
@@ -43,7 +43,7 @@ public ExpressionNode(ExpressionStrategy expressionStrategy, ExpressionToken tok
 
   @Override
   public OutputNode render(JinjavaInterpreter interpreter) {
-    interpreter.getContext().setCurrentNode(this);
+    preProcess(interpreter);
     try {
       return expressionStrategy.interpretOutput(master, interpreter);
     } catch (DeferredValueException e) {

diff --git a/src/main/java/com/hubspot/jinjava/tree/Node.java b/src/main/java/com/hubspot/jinjava/tree/Node.java
@@ -15,6 +15,7 @@
  **********************************************************************/
 package com.hubspot.jinjava.tree;
 
+import com.hubspot.jinjava.interpret.InterpretException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.tree.output.OutputNode;
 import com.hubspot.jinjava.tree.parse.Token;
@@ -97,4 +98,19 @@ public String toTreeString(int level) {
 
     return t.toString();
   }
+
+  public void preProcess(JinjavaInterpreter interpreter) {
+    interpreter.getContext().setCurrentNode(this);
+    checkForInterrupt();
+  }
+
+  public final void checkForInterrupt() {
+    if (Thread.interrupted()) {
+      throw new InterpretException(
+        "Interrupt rendering " + getClass(),
+        master.getLineNumber(),
+        master.getStartPosition()
+      );
+    }
+  }
 }
diff --git a/src/main/java/com/hubspot/jinjava/tree/TagNode.java b/src/main/java/com/hubspot/jinjava/tree/TagNode.java
@@ -44,13 +44,12 @@ public TagNode(Tag tag, TagToken token, TokenScannerSymbols symbols) {
 
   @Override
   public OutputNode render(JinjavaInterpreter interpreter) {
-    interpreter.getContext().setCurrentNode(this);
+    preProcess(interpreter);
     if (
       interpreter.getContext().isValidationMode() && !tag.isRenderedInValidationMode()
     ) {
       return new RenderedOutputNode("");
     }
-
     try {
       if (interpreter.getConfig().getExecutionMode().useEagerParser()) {
         interpreter.getContext().checkNumberOfDeferredTokens();

diff --git a/src/main/java/com/hubspot/jinjava/tree/TextNode.java b/src/main/java/com/hubspot/jinjava/tree/TextNode.java
@@ -32,7 +32,7 @@ public TextNode(TextToken token) {
 
   @Override
   public OutputNode render(JinjavaInterpreter interpreter) {
-    interpreter.getContext().setCurrentNode(this);
+    preProcess(interpreter);
     return new RenderedOutputNode(
       interpreter.getContext().isValidationMode() ? "" : master.output()
     );