diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-30 17:02:39 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-30 17:02:39 +0400 |
| commit | 81a906af01167e1b022d9061fffee2e88ad787ca (patch) | |
| tree | 3a105e263e3f84c1e72345f32675186a9cf8c0a4 | |
| parent | Merge pull request #190 from hamano/mod_register_web_response_404 (diff) | |
| parent | fix error handling when sql calling with unknown host. (diff) | |
Merge pull request #191 from hamano/added_get_random_pid_error_handling
fix error handling when sql calling with unknown host.
| -rw-r--r-- | src/ejabberd_auth_odbc.erl | 1 | ||||
| -rw-r--r-- | src/ejabberd_odbc.erl | 2 |
2 files changed, 2 insertions, 1 deletions
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) |