aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2010-11-17 17:14:47 +0900
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2010-11-17 17:14:47 +0900
commit0d2a8cd04f3f360ee76ba68336a8e156c7cb29cc (patch)
tree1731e78378fc8b359c60b32b8b2a187fd1d3a8a7
parentSet SSL_MODE_RELEASE_BUFFERS mode when available (EJAB-1351) (diff)
Do not print full error message when LDAP timeout occurs (EJAB-1324)
-rw-r--r--src/eldap/eldap_pool.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/eldap/eldap_pool.erl b/src/eldap/eldap_pool.erl
index ed03692e7..c8f224824 100644
--- a/src/eldap/eldap_pool.erl
+++ b/src/eldap/eldap_pool.erl
@@ -71,6 +71,8 @@ do_request(Name, {F, Args}) ->
case pg2:get_closest_pid(make_id(Name)) of
Pid when is_pid(Pid) ->
case catch apply(eldap, F, [Pid | Args]) of
+ {'EXIT', {timeout, _}} ->
+ ?ERROR_MSG("LDAP request failed: timed out", []);
{'EXIT', Reason} ->
?ERROR_MSG("LDAP request failed: eldap:~p(~p)~nReason: ~p",
[F, Args, Reason]),