From 3e4ed83cb39db4532ad407616d872a07eae71436 Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Thu, 30 Mar 2017 17:51:37 +0300
Subject: [PATCH] Raise bad_node instead of node_down for consistency reason

---
 src/aux.erl                 | 2 +-
 src/ejabberd_router_sql.erl | 2 +-
 src/ejabberd_sm_sql.erl     | 8 ++++----
 src/mod_bosh_sql.erl        | 2 +-
 src/mod_muc_sql.erl         | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/aux.erl b/src/aux.erl
index 73372c2b1..6b9935066 100644
--- 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 34e88b471..b879cefae 100644
--- 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 8a2c7cb5f..9a2e6ae35 100644
--- 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 2b21d6c25..c698efbb7 100644
--- 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 391262297..eb7b396cb 100644
--- 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 ->