commit 40d019e4376fa1caf26c0b54790454d4d8530402
author Nick Vatamaniuc <vatamane@apache.org> Fri Jul 21 23:34:22 2017 -0400
committer Nick Vatamaniuc <vatamane@apache.org> Fri Jul 21 23:34:22 2017 -0400
tree a74ae82529775226013d3664dc37faf3f5f1d2fd
parent edd59c6b6e6c645ceb94b39d76d8b05a92b525d8
parent ac2a33e240669f24af5b8e86499d9b88f8df61b2

Merge remote-tracking branch 'cloudant/issue-703'

Fixes #703

src/config.erl

diff --git a/src/config.erl b/src/config.erl
index 2c7819b..aa127d8 100644
--- a/src/config.erl
+++ b/src/config.erl
@@ -42,6 +42,8 @@
 
 -define(FEATURES, "features").
 
+-define(TIMEOUT, 30000).
+
 -record(config, {
     notify_funs=[],
     ini_files=undefined,
@@ -57,7 +59,7 @@
 
 
 reload() ->
-    gen_server:call(?MODULE, reload).
+    gen_server:call(?MODULE, reload, ?TIMEOUT).
 
 all() ->
     lists:sort(gen_server:call(?MODULE, all, infinity)).
@@ -166,7 +168,8 @@
     ?MODULE:set(binary_to_list(Sec), binary_to_list(Key), Val, Persist, Reason);
 set(Section, Key, Value, Persist, Reason)
         when is_list(Section), is_list(Key), is_list(Value) ->
-    gen_server:call(?MODULE, {set, Section, Key, Value, Persist, Reason});
+    gen_server:call(?MODULE, {set, Section, Key, Value, Persist, Reason},
+        ?TIMEOUT);
 set(_Sec, _Key, _Val, _Persist, _Reason) ->
     error(badarg).
 
@@ -184,7 +187,8 @@
 delete(Sec, Key, Persist, Reason) when is_binary(Sec) and is_binary(Key) ->
     delete(binary_to_list(Sec), binary_to_list(Key), Persist, Reason);
 delete(Section, Key, Persist, Reason) when is_list(Section), is_list(Key) ->
-    gen_server:call(?MODULE, {delete, Section, Key, Persist, Reason}).
+    gen_server:call(?MODULE, {delete, Section, Key, Persist, Reason},
+        ?TIMEOUT).
 
 
 features() ->