Browse Source

Rename transaction_query_timeout to transaction_timeout

Sergey Prokhorov 8 years ago
parent
commit
1200f01ba3
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/epgsql_pool.app.src
  2. 1 1
      src/epgsql_pool.erl

+ 1 - 1
src/epgsql_pool.app.src

@@ -9,7 +9,7 @@
   {env, [
          {connection_timeout, 10000},
          {query_timeout, 10000},
-         {transaction_query_timeout, 20000},
+         {transaction_timeout, 20000},
          {pooler_get_worker_timeout, 10000},
          {pooler_max_queue, 1000},
          {max_reconnect_timeout, 5000},

+ 1 - 1
src/epgsql_pool.erl

@@ -126,7 +126,7 @@ do_query(PoolName0, QueryTuple, Options) ->
 -spec transaction(pool_name(), fun()) -> epgsql:reply() | {error, term()}.
 transaction(PoolName0, Fun) ->
     PoolName = epgsql_pool_utils:pool_name_to_atom(PoolName0),
-    Timeout = application:get_env(epgsql_pool, transaction_query_timeout, 10000),
+    Timeout = application:get_env(epgsql_pool, transaction_timeout, 20000),
     with_worker(
       PoolName,
       fun(Worker) ->