Merge remote-tracking branch 'origin/master' into RED-9349-rule-log

This commit is contained in:
Andrei Isvoran 2024-06-26 09:38:52 +03:00
commit b4b9213996
3 changed files with 8 additions and 2 deletions

View File

@ -34,4 +34,10 @@ public class RedactionServiceSettings {
private boolean annotationMode;
public int getDroolsExecutionTimeoutSecs(int numberOfPages) {
return (int) Math.max(getDroolsExecutionTimeoutSecs(), getDroolsExecutionTimeoutSecs() * ((float) numberOfPages / 1000));
}
}

View File

@ -99,7 +99,7 @@ public class ComponentDroolsExecutionService {
});
try {
completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(), TimeUnit.SECONDS)
completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS)
.get();
} catch (ExecutionException e) {
logger.error(context, "Exception during rule execution", e);

View File

@ -139,7 +139,7 @@ public class EntityDroolsExecutionService {
});
try {
completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(), TimeUnit.SECONDS)
completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS)
.get();
} catch (ExecutionException e) {
logger.error(context, "Exception during rule execution", e);