Able to set timeout with object-length

leo-project · Dec 10, 2012 · 1c9824a · 1c9824a
1 parent f4acac1
commit 1c9824a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/include/leo_gateway.hrl b/include/leo_gateway.hrl
@@ -68,8 +68,8 @@
 -define(TIMEOUT_L1_SEC,    5000).
 -define(TIMEOUT_L2_SEC,    7000).
 -define(TIMEOUT_L3_SEC,   10000).
--define(TIMEOUT_L4_SEC,   12000).
--define(TIMEOUT_L5_SEC,   15000).
+-define(TIMEOUT_L4_SEC,   20000).
+-define(TIMEOUT_L5_SEC,   30000).
 
 
 %% macros.
@@ -92,6 +92,36 @@
             _ -> ?S3_HTTP
         end).
 
+-define(env_timeout_level_1(),
+        case application:get_env(leo_gateway, timeout_level_1) of
+            {ok, EnvTimeoutL1} -> EnvTimeoutL1;
+            _ -> ?TIMEOUT_L1_SEC
+        end).
+
+-define(env_timeout_level_2(),
+        case application:get_env(leo_gateway, timeout_level_2) of
+            {ok, EnvTimeoutL2} -> EnvTimeoutL2;
+            _ -> ?TIMEOUT_L2_SEC
+        end).
+
+-define(env_timeout_level_3(),
+        case application:get_env(leo_gateway, timeout_level_3) of
+            {ok, EnvTimeoutL3} -> EnvTimeoutL3;
+            _ -> ?TIMEOUT_L3_SEC
+        end).
+
+-define(env_timeout_level_4(),
+        case application:get_env(leo_gateway, timeout_level_4) of
+            {ok, EnvTimeoutL4} -> EnvTimeoutL4;
+            _ -> ?TIMEOUT_L4_SEC
+        end).
+
+-define(env_timeout_level_5(),
+        case application:get_env(leo_gateway, timeout_level_5) of
+            {ok, EnvTimeoutL5} -> EnvTimeoutL5;
+            _ -> ?TIMEOUT_L5_SEC
+        end).
+
 
 %% REQ/RESP ERRORS
 -record(error_code, {

diff --git a/src/leo_gateway_rpc_handler.erl b/src/leo_gateway_rpc_handler.erl
@@ -254,11 +254,11 @@ handle_error(Node, Mod, Method, _Args, timeout = Error) ->
 
 %% @doc Timeout depends on length of an object
 %%
-timeout(Len) when ?TIMEOUT_L1_LEN > Len -> ?TIMEOUT_L1_SEC;
-timeout(Len) when ?TIMEOUT_L2_LEN > Len -> ?TIMEOUT_L2_SEC;
-timeout(Len) when ?TIMEOUT_L3_LEN > Len -> ?TIMEOUT_L3_SEC;
-timeout(Len) when ?TIMEOUT_L4_LEN > Len -> ?TIMEOUT_L4_SEC;
-timeout(_)                              -> ?TIMEOUT_L5_SEC.
+timeout(Len) when ?TIMEOUT_L1_LEN > Len -> ?env_timeout_level_1();
+timeout(Len) when ?TIMEOUT_L2_LEN > Len -> ?env_timeout_level_2();
+timeout(Len) when ?TIMEOUT_L3_LEN > Len -> ?env_timeout_level_3();
+timeout(Len) when ?TIMEOUT_L4_LEN > Len -> ?env_timeout_level_4();
+timeout(_)                              -> ?env_timeout_level_5().
 
 timeout(put, [#object{dsize = DSize}, _]) ->
     timeout(DSize);