Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-9837: Fixed not working timeout with endless loop in drools then block

Browse Source
This commit is contained in:
Dominique Eifländer 2024-08-19 13:18:00 +02:00
parent 00409584ee
commit 2ae8b0fbce
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/ComponentDroolsExecutionService.java
View File

@ -104,8 +104,7 @@ public class ComponentDroolsExecutionService {
}); });
try { try {
completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS) completableFuture.get(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS);
.get();
} catch (ExecutionException e) { } catch (ExecutionException e) {
logger.error(e, "Exception during rule execution"); logger.error(e, "Exception during rule execution");
kieSession.dispose(); kieSession.dispose();
@ -117,6 +116,8 @@ public class ComponentDroolsExecutionService {
logger.error(e, "Exception during rule execution"); logger.error(e, "Exception during rule execution");
kieSession.dispose(); kieSession.dispose();
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (TimeoutException e) {
throw new DroolsTimeoutException(e, false, RuleFileType.COMPONENT);
} }
List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession); List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession);

5
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java
View File

@ -142,8 +142,7 @@ public class EntityDroolsExecutionService {
}); });
try { try {
completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS) completableFuture.get(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS);
.get();
} catch (ExecutionException e) { } catch (ExecutionException e) {
logger.error(e,"Exception during rule execution"); logger.error(e,"Exception during rule execution");
kieSession.dispose(); kieSession.dispose();
@ -155,6 +154,8 @@ public class EntityDroolsExecutionService {
logger.error(e,"Exception during rule execution"); logger.error(e,"Exception during rule execution");
kieSession.dispose(); kieSession.dispose();
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (TimeoutException e) {
throw new DroolsTimeoutException(e, false, RuleFileType.ENTITY);
} }
List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession); List<FileAttribute> resultingFileAttributes = getFileAttributes(kieSession);