From a6408e92818a52f92c47a70ffd4eecb127ebc7cc Mon Sep 17 00:00:00 2001 From: HAMANO Tsukasa Date: Wed, 30 Apr 2014 15:32:07 +0900 Subject: [PATCH] fix error handling when sql calling with unknown host. --- src/ejabberd_auth_odbc.erl | 1 + src/ejabberd_odbc.erl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl index 57cef930a..27e89aa2b 100644 --- a/src/ejabberd_auth_odbc.erl +++ b/src/ejabberd_auth_odbc.erl @@ -212,6 +212,7 @@ is_user_exists(User, Server) -> true; %% Account exists {selected, [<<"password">>], []} -> false; %% Account does not exist + {error, unknownhost} -> false; {error, Error} -> {error, Error} catch _:B -> {error, B} diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl index 802e32ae2..df9a4c398 100644 --- a/src/ejabberd_odbc.erl +++ b/src/ejabberd_odbc.erl @@ -141,7 +141,7 @@ sql_call(Host, Msg) -> case get(?STATE_KEY) of undefined -> case ejabberd_odbc_sup:get_random_pid(Host) of - none -> ?WARNING_MSG("SQL calling unknown host: ~p~n", [Host]); + none -> {error, unknownhost}; Pid -> (?GEN_FSM):sync_send_event(Pid,{sql_cmd, Msg, now()}, ?TRANSACTION_TIMEOUT) -- 2.50.1