Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle thread interrupts by throwing an InterpretException #870

Merged
merged 1 commit into from
Jun 2, 2022
Merged

Handle thread interrupts by throwing an InterpretException #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/hubspot/jinjava/tree/ExpressionNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/hubspot/jinjava/tree/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
);
}
}
}
3 changes: 1 addition & 2 deletions src/main/java/com/hubspot/jinjava/tree/TagNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hubspot/jinjava/tree/TextNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down