From bb9da929b8ee14a99a6953b13a8951fef58b4d55 Mon Sep 17 00:00:00 2001 From: Christopher Meiklejohn Date: Sat, 24 Aug 2013 16:54:32 -0700 Subject: [PATCH] Add timeout to environment. --- src/js_driver.erl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js_driver.erl b/src/js_driver.erl index 31c4b80..d03af23 100644 --- a/src/js_driver.erl +++ b/src/js_driver.erl @@ -140,7 +140,9 @@ define_js(Ctx, FileName, Js, Timeout) when is_binary(FileName), %% @spec eval_js(port(), binary()) -> {ok, any()} | {error, any()} %% @doc Evaluate a Javascript expression and return the result eval_js(Ctx, Js) -> - eval_js(Ctx, Js, ?SCRIPT_TIMEOUT). + ScriptTimeout = app_helper:get_env(erlang_js, script_timeout, + ?SCRIPT_TIMEOUT), + eval_js(Ctx, Js, ScriptTimeout). %% @private eval_js(Ctx, {file, FileName}, Timeout) ->