setup_srv: have timeout configurable

meike-hecker · May 18, 2016 · aefeb8e · aefeb8e
1 parent 1d87014
commit aefeb8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/setup.erl b/src/setup.erl
@@ -130,6 +130,7 @@
 %%    the environment variable `{verify_directories, false}'. This can be desirable
 %%    if setup is used mainly e.g. for environment variable expansion, but not for
 %%    disk storage.
+%% * `{timeout, integer()}' - time to wait for run_setup to finish
 %% @end
 -module(setup).
 

diff --git a/src/setup_srv.erl b/src/setup_srv.erl
@@ -31,7 +31,8 @@ start_link() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
 run_setup() ->
-    gen_server:call(?MODULE, run_setup).
+    Timeout = setup:get_env(setup, timeout, 5000),
+    gen_server:call(?MODULE, run_setup, Timeout).
 
 init(_) ->
     {ok, []}.