Raise bad_node instead of node_down for consistency reason

diff --git a/src/aux.erl b/src/aux.erl
index 73372c2b1c76437003ed569b08d1250216ec01f1..6b99350669cc20fb54f160c11953701f8dc0c6bb 100644 (file)
--- a/src/aux.erl
+++ b/src/aux.erl
@@ -209,7 +209,7 @@ decode_pid(PidBin, NodeBin) ->
        Node ->
            try set_node_id(PidStr, NodeBin)
            catch _:badarg ->
-                   erlang:error({node_down, Node})
+                   erlang:error({bad_node, Node})
            end
     end.
 

diff --git a/src/ejabberd_router_sql.erl b/src/ejabberd_router_sql.erl
index 34e88b471a2c786072f27a6aa60274ab3b4f4c53..b879cefae1db0346be7ad777ec829736668361d8 100644 (file)
--- a/src/ejabberd_router_sql.erl
+++ b/src/ejabberd_router_sql.erl
@@ -158,7 +158,7 @@ row_to_route(Domain, {ServerHost, NodeS, PidS, LocalHintS} = Row) ->
                server_host = ServerHost,
                pid = aux:decode_pid(PidS, NodeS),
                local_hint = dec_local_hint(LocalHintS)}]
-    catch _:{node_down, _} ->
+    catch _:{bad_node, _} ->
            [];
          E:R ->
            ?ERROR_MSG("failed to decode row from 'route' table:~n"

diff --git a/src/ejabberd_sm_sql.erl b/src/ejabberd_sm_sql.erl
index 8a2c7cb5f7b77ddffe7cf4e31b506b098e7fe46d..9a2e6ae3564d5f77a507cc4d3c16b7f8b6d02709 100644 (file)
--- a/src/ejabberd_sm_sql.erl
+++ b/src/ejabberd_sm_sql.erl
@@ -98,7 +98,7 @@ delete_session(_LUser, LServer, _LResource, {Now, Pid}) ->
               ?SQL("delete from sm"
                    " where usec=%(TS)d and pid=%(PidS)s")),
            try {ok, row_to_session(LServer, Row)}
-           catch _:{node_down, _} -> {error, notfound}
+           catch _:{bad_node, _} -> {error, notfound}
            end;
        {selected, []} ->
            {error, notfound};
@@ -122,7 +122,7 @@ get_sessions(LServer) ->
            lists:flatmap(
              fun(Row) ->
                      try [row_to_session(LServer, Row)]
-                     catch _:{node_down, _} -> []
+                     catch _:{bad_node, _} -> []
                      end
              end, Rows);
        Err ->
@@ -140,7 +140,7 @@ get_sessions(LUser, LServer) ->
            lists:flatmap(
              fun(Row) ->
                      try [row_to_session(LServer, Row)]
-                     catch _:{node_down, _} -> []
+                     catch _:{bad_node, _} -> []
                      end
              end, Rows);
        Err ->
@@ -158,7 +158,7 @@ get_sessions(LUser, LServer, LResource) ->
            lists:flatmap(
              fun(Row) ->
                      try [row_to_session(LServer, Row)]
-                     catch _:{node_down, _} -> []
+                     catch _:{bad_node, _} -> []
                      end
              end, Rows);
        Err ->

diff --git a/src/mod_bosh_sql.erl b/src/mod_bosh_sql.erl
index 2b21d6c258473a27fe6f75b95c28c5a376f17d35..c698efbb77bbb18028844e0505899a2d3daec4b5 100644 (file)
--- a/src/mod_bosh_sql.erl
+++ b/src/mod_bosh_sql.erl
@@ -58,7 +58,7 @@ find_session(SID) ->
           ?SQL("select @(pid)s, @(node)s from bosh where sid=%(SID)s")) of
        {selected, [{Pid, Node}]} ->
            try {ok, aux:decode_pid(Pid, Node)}
-           catch _:{node_down, _} -> error
+           catch _:{bad_node, _} -> error
            end;
        {selected, []} ->
            error;

diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
index 391262297c3cdb0e9dbdabf554351deec8787097..eb7b396cb50e61d40bd680f61dd9c1392c995b93 100644 (file)
--- a/src/mod_muc_sql.erl
+++ b/src/mod_muc_sql.erl
@@ -202,7 +202,7 @@ find_online_room(ServerHost, Room, Host) ->
                "name=%(Room)s and host=%(Host)s")) of
        {selected, [{PidS, NodeS}]} ->
            try {ok, aux:decode_pid(PidS, NodeS)}
-           catch _:{node_down, _} -> error
+           catch _:{bad_node, _} -> error
            end;
        {selected, []} ->
            error;
@@ -232,7 +232,7 @@ get_online_rooms(ServerHost, Host, _RSM) ->
            lists:flatmap(
              fun({Room, PidS, NodeS}) ->
                      try [{Room, Host, aux:decode_pid(PidS, NodeS)}]
-                     catch _:{node_down, _} -> []
+                     catch _:{bad_node, _} -> []
                      end
              end, Rows);
        Err ->