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

[automation] Add support for synchronized execution of compiled scripts #4402

Merged
merged 4 commits into from
Oct 6, 2024
Merged

[automation] Add support for synchronized execution of compiled scripts #4402

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7494ef4
[automation] Synchronize execution of compiled scripts if ScriptEngin…
florian-h05 Oct 4, 2024
747d7fa
Add comment
florian-h05 Oct 4, 2024
2958f4e
Address review
florian-h05 Oct 5, 2024
5a05066
Address review
florian-h05 Oct 6, 2024
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
20 changes: 18 additions & 2 deletions ...g/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import java.util.Map.Entry;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;

import javax.script.Compilable;
import javax.script.CompiledScript;
Expand Down Expand Up @@ -210,15 +212,29 @@ protected void resetExecutionContext(ScriptEngine engine, Map<String, ?> context
protected @Nullable Object eval(ScriptEngine engine, String script) {
try {
if (compiledScript.isPresent()) {
if (engine instanceof Lock lock && !lock.tryLock(1, TimeUnit.MINUTES)) {
logger.error("Failed to acquire lock within one minute for script module of rule with UID '{}'",
ruleUID);
return null;
}
logger.debug("Executing pre-compiled script of rule with UID '{}'", ruleUID);
return compiledScript.get().eval(engine.getContext());
try {
return compiledScript.get().eval(engine.getContext());
} finally { // Make sure that Lock is unlocked regardless of an exception being thrown or not to avoid
// deadlocks
if (engine instanceof Lock lock) {
lock.unlock();
}
}
}
logger.debug("Executing script of rule with UID '{}'", ruleUID);
return engine.eval(script);
} catch (ScriptException e) {
logger.error("Script execution of rule with UID '{}' failed: {}", ruleUID, e.getMessage(),
logger.isDebugEnabled() ? e : null);
return null;
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
return null;
}
}