Merge pull request #84 from opscode/of/blocking_take_pooler

Leverage blocking take_member in pooler

itest/itest.erl

@@ -31,6 +31,7 @@
                 ["Chris", "Maier", 0, <<"2011-10-03 16:47:46">>, true],
                 ["Elvis", "Presley", 16, <<"2011-10-04 16:47:46">>, false]]).
 -define(POOL_NAME, sqerl).
+-define(POOLER_TIMEOUT, 500).
 -define(MAX_POOL_COUNT, 3).
 
 -compile([export_all]).
@@ -49,6 +50,7 @@ setup_env() ->
     ok = application:set_env(sqerl, db_pass, "itest"),
     ok = application:set_env(sqerl, db_name, ?GET_ARG(db, Info)),
     ok = application:set_env(sqerl, idle_check, 10000),
+    ok = application:set_env(sqerl, pooler_timeout, ?POOLER_TIMEOUT),
     %% we could also call it like this:
     %% {prepared_statements, statements()},
     %% {prepared_statements, "itest/statements_pgsql.conf"},
@@ -196,9 +198,9 @@ basic_test_() ->
      ]}.
 
 kill_pool(1) ->
-    pooler:take_member(?POOL_NAME);
+    pooler:take_member(?POOL_NAME, ?POOLER_TIMEOUT);
 kill_pool(X) ->
-    pooler:take_member(?POOL_NAME),
+    pooler:take_member(?POOL_NAME, ?POOLER_TIMEOUT),
     kill_pool(X - 1).
 
 pool_overflow() ->

rebar.config

@@ -17,7 +17,7 @@
          {git, "git://github.com/opscode/epgsql.git", "master"}},
 
         {pooler, ".*",
-         {git, "git://github.com/seth/pooler.git", {tag, "1.2.2"}}},
+         {git, "git://github.com/seth/pooler.git", {tag, "1.3.3"}}},
 
         {envy, ".*",
          {git, "git://github.com/manderson26/envy.git", {branch, "master"}}}

src/sqerl.erl

@@ -50,7 +50,7 @@
 -define(PGSQL_ERROR_CODES, [{<<"23505">>, conflict}, {<<"23503">>, foreign_key}]).
 
 checkout() ->
-    pooler:take_member(sqerl).
+    pooler:take_member(sqerl, envy:get(sqerl, pooler_timeout, 0, integer)).
 
 checkin(Connection) ->
     pooler:return_member(sqerl, Connection).