Add code for handling deprecations of get_stacktrace()

include/ejabberd_stacktrace.hrl

@@ -0,0 +1,27 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-ifdef(DEPRECATED_GET_STACKTRACE).
+-define(EX_RULE(Class, Reason, Stack), Class:Reason:Stack).
+-define(EX_STACK(Stack), Stack).
+-else.
+-define(EX_RULE(Class, Reason, _), Class:Reason).
+-define(EX_STACK(_), erlang:get_stacktrace()).
+-endif.

mix.exs

@@ -42,10 +42,19 @@ defmodule Ejabberd.Mixfile do
     end
   end
 
+  defp if_version_above(ver, okResult) do
+    if :erlang.system_info(:otp_release) > ver do
+      okResult
+    else
+      []
+    end
+  end
+
   defp erlc_options do
     # Use our own includes + includes from all dependencies
     includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"])
     [:debug_info, {:d, :ELIXIR_ENABLED}] ++ cond_options() ++ Enum.map(includes, fn(path) -> {:i, path} end) ++
+    if_version_above('20', [{:d, :DEPRECATED_GET_STACKTRACE}]) ++
     if_function_exported(:crypto, :strong_rand_bytes, 1, [{:d, :STRONG_RAND_BYTES}]) ++
     if_function_exported(:rand, :uniform, 1, [{:d, :RAND_UNIFORM}]) ++
     if_function_exported(:gb_sets, :iterator_from, 2, [{:d, :GB_SETS_ITERATOR_FROM}]) ++

rebar.config

@@ -92,6 +92,7 @@
             {if_var_true, debug, debug_info},
             {if_var_true, sip, {d, 'SIP'}},
             {if_var_true, stun, {d, 'STUN'}},
+            {if_version_above, "20", {d, 'DEPRECATED_GET_STACKTRACE'}},
             {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
             {if_var_match, db_type, mssql, {d, 'mssql'}},
             {if_var_true, elixir, {d, 'ELIXIR_ENABLED'}},

src/ejabberd_acme.erl

@@ -25,6 +25,7 @@
 -include("ejabberd_commands.hrl").
 -include("ejabberd_acme.hrl").
 -include_lib("public_key/include/public_key.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(DEFAULT_CONFIG_CONTACT, <<"mailto:example-admin@example.com">>).
 -define(DEFAULT_CONFIG_CA_URL, "https://acme-v01.api.letsencrypt.org").
@@ -150,9 +151,8 @@ get_certificates(Domains) ->
 	    catch
 		throw:Throw ->
 		    Throw;
-		E:R ->
+		?EX_RULE(E, R, St) ->
-                    St = erlang:get_stacktrace(),
+		    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-		    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 		    {error, get_certificates}
 	    end;
 	false ->
@@ -243,9 +243,8 @@ get_certificate(CAUrl, DomainName, PrivateKey) ->
     catch
 	throw:Throw ->
 	    Throw;
-	E:R ->
+	?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
+	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 	    {error, DomainName, get_certificate}
     end.
 
@@ -383,9 +382,8 @@ renew_certificates() ->
     catch
 	throw:Throw ->
 	    Throw;
-	E:R ->
+	?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
+	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 	    {error, get_certificates}
     end.
 
@@ -449,9 +447,8 @@ list_certificates(Verbose) ->
 	    catch
 		throw:Throw ->
 		    Throw;
-		E:R ->
+		?EX_RULE(E, R, St) ->
-                    St = erlang:get_stacktrace(),
+		    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-		    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 		    {error, list_certificates}
 	    end;
 	false ->
@@ -492,9 +489,8 @@ format_certificate(DataCert, Verbose) ->
 		format_certificate_verbose(DomainName, SANs, NotAfter, PemCert)
 	end
     catch
-	E:R ->
+	?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
+	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 	    fail_format_certificate(DomainName)
     end.
 
@@ -618,9 +614,8 @@ revoke_certificates(DomainOrFile) ->
     catch
 	throw:Throw ->
 	    Throw;
-	E:R ->
+	?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
+	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 	    {error, revoke_certificate}
     end.
 
@@ -1123,9 +1118,8 @@ save_certificate({ok, DomainName, Cert}) ->
     catch
 	throw:Throw ->
 	    Throw;
-	E:R ->
+	?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
+	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]),
-	    ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, St]),
 	    {error, DomainName, saving}
     end.
 

src/ejabberd_ctl.erl

@@ -59,6 +59,7 @@
 -include("ejabberd_ctl.hrl").
 -include("ejabberd_commands.hrl").
 -include("logger.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(DEFAULT_VERSION, 1000000).
 
@@ -327,9 +328,9 @@ try_call_command(Args, Auth, AccessCommands, Version) ->
     catch
 	throw:Error ->
 	    {io_lib:format("~p", [Error]), ?STATUS_ERROR};
-	A:Why ->
+	?EX_RULE(A, Why, Stack) ->
-	    Stack = erlang:get_stacktrace(),
+	    {io_lib:format("Problem '~p ~p' occurred executing the command.~nStacktrace: ~p",
-	    {io_lib:format("Problem '~p ~p' occurred executing the command.~nStacktrace: ~p", [A, Why, Stack]), ?STATUS_ERROR}
+			   [A, Why, ?EX_STACK(Stack)]), ?STATUS_ERROR}
     end.
 
 %% @spec (Args::[string()], Auth, AccessCommands) -> string() | integer() | {string(), integer()} | {error, ErrorType}

src/ejabberd_hooks.erl

@@ -57,6 +57,7 @@
 	 terminate/2]).
 
 -include("logger.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -record(state, {}).
 -type local_hook() :: { Seq :: integer(), Module :: atom(), Function :: atom()}.
@@ -379,15 +380,11 @@ safe_apply(Hook, Module, Function, Args) ->
        true ->
 		apply(Module, Function, Args)
 	end
-    catch E:R when E /= exit; R /= normal ->
+    catch ?EX_RULE(E, R, St) when E /= exit; R /= normal ->
-            St = get_stacktrace(),
 	    ?ERROR_MSG("Hook ~p crashed when running ~p:~p/~p:~n"
 		       "** Reason = ~p~n"
 		       "** Arguments = ~p",
 		       [Hook, Module, Function, length(Args),
-			{E, R, St}, Args]),
+			{E, R, ?EX_STACK(St)}, Args]),
 	    'EXIT'
     end.
-
-get_stacktrace() ->
-    [{Mod, Fun, Loc, Args} || {Mod, Fun, Args, Loc} <- erlang:get_stacktrace()].

src/ejabberd_local.erl

@@ -48,6 +48,7 @@
 -include("logger.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -include("xmpp.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -record(state, {}).
 
@@ -70,10 +71,9 @@ start_link() ->
 -spec route(stanza()) -> any().
 route(Packet) ->
     try do_route(Packet)
-    catch E:R ->
+    catch ?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
 	    ?ERROR_MSG("failed to route packet:~n~s~nReason = ~p",
-		       [xmpp:pp(Packet), {E, {R, St}}])
+		       [xmpp:pp(Packet), {E, {R, ?EX_STACK(St)}}])
     end.
 
 -spec route_iq(iq(), function()) -> ok.

src/ejabberd_mnesia.erl

@@ -43,6 +43,7 @@
 -define(NEED_RESET, [local_content, type]).
 
 -include("logger.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -record(state, {tables = #{} :: map(),
 		schema = [] :: [{atom(), [{atom(), any()}]}]}).
@@ -385,8 +386,8 @@ do_transform(OldAttrs, Attrs, Old) ->
 transform_fun(Module, Name) ->
     fun(Obj) ->
 	    try Module:transform(Obj)
-	    catch E:R ->
+	    catch ?EX_RULE(E, R, St) ->
-		    StackTrace = erlang:get_stacktrace(),
+		    StackTrace = ?EX_STACK(St),
 		    ?ERROR_MSG("Failed to transform Mnesia table ~s:~n"
 			       "** Record: ~p~n"
 			       "** Reason: ~p~n"

src/ejabberd_redis.erl

@@ -50,6 +50,7 @@
 -define(CALL_TIMEOUT, 60*1000). %% 60 seconds
 
 -include("logger.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -record(state, {connection :: pid() | undefined,
 		num :: pos_integer(),
@@ -106,9 +107,9 @@ multi(F) ->
 			{error, _} = Err -> Err;
 			Result -> get_result(Result)
 		    end
-	    catch E:R ->
+	    catch ?EX_RULE(E, R, St) ->
 		    erlang:erase(?TR_STACK),
-		    erlang:raise(E, R, erlang:get_stacktrace())
+		    erlang:raise(E, R, ?EX_STACK(St))
 	    end;
 	_ ->
 	    erlang:error(nested_transaction)

src/ejabberd_router.erl

@@ -71,6 +71,7 @@
 -include("logger.hrl").
 -include("ejabberd_router.hrl").
 -include("xmpp.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -callback init() -> any().
 -callback register_route(binary(), binary(), local_hint(),
@@ -90,10 +91,9 @@ start_link() ->
 -spec route(stanza()) -> ok.
 route(Packet) ->
     try do_route(Packet)
-    catch E:R ->
+    catch ?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
 	    ?ERROR_MSG("failed to route packet:~n~s~nReason = ~p",
-		       [xmpp:pp(Packet), {E, {R, St}}])
+		       [xmpp:pp(Packet), {E, {R, ?EX_STACK(St)}}])
     end.
 
 -spec route(jid(), jid(), xmlel() | stanza()) -> ok.

src/ejabberd_router_sql.erl

@@ -32,6 +32,7 @@
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
 -include("ejabberd_router.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 %%%===================================================================
 %%% API
@@ -121,12 +122,11 @@ row_to_route(Domain, {ServerHost, NodeS, PidS, LocalHintS} = Row) ->
 		local_hint = dec_local_hint(LocalHintS)}]
     catch _:{bad_node, _} ->
 	    [];
-	  E:R ->
+	  ?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
 	    ?ERROR_MSG("failed to decode row from 'route' table:~n"
 		       "Row = ~p~n"
 		       "Domain = ~s~n"
 		       "Reason = ~p",
-		       [Row, Domain, {E, {R, St}}]),
+		       [Row, Domain, {E, {R, ?EX_STACK(St)}}]),
 	    []
     end.

src/ejabberd_s2s.erl

@@ -55,12 +55,10 @@
 	 transform_options/1, opt_type/1]).
 
 -include("logger.hrl").
-
 -include("xmpp.hrl").
-
 -include("ejabberd_commands.hrl").
-
 -include_lib("public_key/include/public_key.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(PKIXEXPLICIT, 'OTP-PUB-KEY').
 
@@ -94,10 +92,9 @@ start_link() ->
 
 route(Packet) ->
     try do_route(Packet)
-    catch E:R ->
+    catch ?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
             ?ERROR_MSG("failed to route packet:~n~s~nReason = ~p",
-                       [xmpp:pp(Packet), {E, {R, St}}])
+                       [xmpp:pp(Packet), {E, {R, ?EX_STACK(St)}}])
     end.
 
 clean_temporarily_blocked_table() ->

src/ejabberd_sm.erl

@@ -90,6 +90,7 @@
 
 -include("ejabberd_commands.hrl").
 -include("ejabberd_sm.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -callback init() -> ok | {error, any()}.
 -callback set_session(#session{}) -> ok | {error, any()}.
@@ -140,11 +141,10 @@ route(Packet) ->
 	    ?DEBUG("hook dropped stanza:~n~s", [xmpp:pp(Packet)]);
 	Packet1 ->
 	    try do_route(Packet1), ok
-	    catch E:R ->
+	    catch ?EX_RULE(E, R, St) ->
-                    St = erlang:get_stacktrace(),
 		    ?ERROR_MSG("failed to route packet:~n~s~nReason = ~p",
 			       [xmpp:pp(Packet1),
-				{E, {R, St}}])
+				{E, {R, ?EX_STACK(St)}}])
 	    end
     end.
 

src/ejabberd_sql.erl

@@ -69,6 +69,7 @@
 
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -record(state,
 	{db_ref = self()                     :: pid(),
@@ -516,24 +517,26 @@ outer_transaction(F, NRestarts, _Reason) ->
     end,
     sql_query_internal([<<"begin;">>]),
     put(?NESTING_KEY, PreviousNestingLevel + 1),
-    Result = (catch F()),
+    try F() of
-    put(?NESTING_KEY, PreviousNestingLevel),
+	Res ->
-    case Result of
+	    sql_query_internal([<<"commit;">>]),
-      {aborted, Reason} when NRestarts > 0 ->
+	    {atomic, Res}
-	  sql_query_internal([<<"rollback;">>]),
+    catch
-	  outer_transaction(F, NRestarts - 1, Reason);
+	?EX_RULE(throw, {aborted, Reason}, _) when NRestarts > 0 ->
-      {aborted, Reason} when NRestarts =:= 0 ->
+	    sql_query_internal([<<"rollback;">>]),
-	  ?ERROR_MSG("SQL transaction restarts exceeded~n** "
+	    outer_transaction(F, NRestarts - 1, Reason);
-		     "Restarts: ~p~n** Last abort reason: "
+	?EX_RULE(throw, {aborted, Reason}, Stack) when NRestarts =:= 0 ->
-		     "~p~n** Stacktrace: ~p~n** When State "
+	    ?ERROR_MSG("SQL transaction restarts exceeded~n** "
-		     "== ~p",
+		       "Restarts: ~p~n** Last abort reason: "
-		     [?MAX_TRANSACTION_RESTARTS, Reason,
+		       "~p~n** Stacktrace: ~p~n** When State "
-		      erlang:get_stacktrace(), get(?STATE_KEY)]),
+		       "== ~p",
-	  sql_query_internal([<<"rollback;">>]),
+		       [?MAX_TRANSACTION_RESTARTS, Reason,
-	  {aborted, Reason};
+			?EX_STACK(Stack), get(?STATE_KEY)]),
-      {'EXIT', Reason} ->
+	    sql_query_internal([<<"rollback;">>]),
-	  sql_query_internal([<<"rollback;">>]), {aborted, Reason};
+	    {aborted, Reason};
-      Res -> sql_query_internal([<<"commit;">>]), {atomic, Res}
+	?EX_RULE(exit, Reason, _) ->
+	    sql_query_internal([<<"rollback;">>]),
+	    {aborted, Reason}
     end.
 
 execute_bloc(F) ->
@@ -599,10 +602,9 @@ sql_query_internal(#sql_query{} = Query) ->
 		{error, <<"killed">>};
 	      exit:{normal, _} ->
 		{error, <<"terminated unexpectedly">>};
-	      Class:Reason ->
+	      ?EX_RULE(Class, Reason, Stack) ->
-                ST = erlang:get_stacktrace(),
                 ?ERROR_MSG("Internal error while processing SQL query: ~p",
-                           [{Class, Reason, ST}]),
+                           [{Class, Reason, ?EX_STACK(Stack)}]),
                 {error, <<"internal error">>}
         end,
     check_error(Res, Query);
@@ -737,12 +739,11 @@ sql_query_format_res({selected, _, Rows}, SQLQuery) ->
                   try
                       [(SQLQuery#sql_query.format_res)(Row)]
                   catch
-                      Class:Reason ->
+		      ?EX_RULE(Class, Reason, Stack) ->
-                          ST = erlang:get_stacktrace(),
                           ?ERROR_MSG("Error while processing "
                                      "SQL query result: ~p~n"
                                      "row: ~p",
-                                     [{Class, Reason, ST}, Row]),
+                                     [{Class, Reason, ?EX_STACK(Stack)}, Row]),
                           []
                   end
           end, Rows),

src/gen_iq_handler.erl

@@ -40,6 +40,7 @@
 -include("logger.hrl").
 -include("xmpp.hrl").
 -include("translate.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -type component() :: ejabberd_sm | ejabberd_local.
 
@@ -113,10 +114,9 @@ process_iq(_Host, Module, Function, IQ) ->
 	    ejabberd_router:route(ResIQ);
 	ignore ->
 	    ok
-    catch E:R ->
+    catch ?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
 	    ?ERROR_MSG("failed to process iq:~n~s~nReason = ~p",
-		       [xmpp:pp(IQ), {E, {R, St}}]),
+		       [xmpp:pp(IQ), {E, {R, ?EX_STACK(St)}}]),
 	    Txt = <<"Module failed to handle the query">>,
 	    Err = xmpp:err_internal_server_error(Txt, IQ#iq.lang),
 	    ejabberd_router:route_error(IQ, Err)

src/gen_mod.erl

@@ -58,6 +58,7 @@
 
 -include("logger.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -record(ejabberd_module,
         {module_host = {undefined, <<"">>} :: {atom(), binary()},
@@ -217,8 +218,8 @@ start_module(Host, Module, Opts0, Order, NeedValidation) ->
 		    {ok, Pid} when is_pid(Pid) -> {ok, Pid};
 		    Err -> erlang:error({bad_return, Module, Err})
 		end
-	    catch Class:Reason ->
+	    catch ?EX_RULE(Class, Reason, Stack) ->
-		    StackTrace = erlang:get_stacktrace(),
+		    StackTrace = ?EX_STACK(Stack),
 		    ets:delete(ejabberd_modules, {Module, Host}),
 		    ErrorText = format_module_error(
 				  Module, start, 2,
@@ -282,8 +283,8 @@ reload_module(Host, Module, NewOpts, OldOpts, Order) ->
 		    {ok, Pid} when is_pid(Pid) -> {ok, Pid};
 		    Err -> erlang:error({bad_return, Module, Err})
 		end
-	    catch Class:Reason ->
+	    catch ?EX_RULE(Class, Reason, Stack) ->
-		    StackTrace = erlang:get_stacktrace(),
+		    StackTrace = ?EX_STACK(Stack),
 		    ErrorText = format_module_error(
                                   Module, reload, 3,
                                   NewOpts, Class, Reason,

src/mod_http_api.erl

@@ -80,6 +80,7 @@
 -include("xmpp.hrl").
 -include("logger.hrl").
 -include("ejabberd_http.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(DEFAULT_API_VERSION, 0).
 
@@ -192,9 +193,8 @@ process([Call], #request{method = 'POST', data = Data, ip = IPPort} = Req) ->
         _:{error,{_,invalid_json}} = _Err ->
 	    ?DEBUG("Bad Request: ~p", [_Err]),
 	    badrequest_response(<<"Invalid JSON input">>);
-	  _:_Error ->
+	?EX_RULE(_Class, _Error, Stack) ->
-            St = erlang:get_stacktrace(),
+            ?DEBUG("Bad Request: ~p ~p", [_Error, ?EX_STACK(Stack)]),
-            ?DEBUG("Bad Request: ~p ~p", [_Error, St]),
             badrequest_response()
     end;
 process([Call], #request{method = 'GET', q = Data, ip = {IP, _}} = Req) ->
@@ -210,9 +210,8 @@ process([Call], #request{method = 'GET', q = Data, ip = {IP, _}} = Req) ->
         %% TODO We need to refactor to remove redundant error return formatting
         throw:{error, unknown_command} ->
             json_format({404, 44, <<"Command not found.">>});
-        _:_Error ->
+        ?EX_RULE(_, _Error, Stack) ->
-            St = erlang:get_stacktrace(),
+            ?DEBUG("Bad Request: ~p ~p", [_Error, ?EX_STACK(Stack)]),
-            ?DEBUG("Bad Request: ~p ~p", [_Error, St]),
             badrequest_response()
     end;
 process([_Call], #request{method = 'OPTIONS', data = <<>>}) ->
@@ -302,9 +301,8 @@ handle(Call, Auth, Args, Version) when is_atom(Call), is_list(Args) ->
 		    {400, misc:atom_to_binary(Error)};
 		  throw:Msg when is_list(Msg); is_binary(Msg) ->
 		    {400, iolist_to_binary(Msg)};
-		  _Error ->
+		  ?EX_RULE(Class, Error, Stack) ->
-                    St = erlang:get_stacktrace(),
+		    ?ERROR_MSG("REST API Error: ~p:~p ~p", [Class, Error, ?EX_STACK(Stack)]),
-		    ?ERROR_MSG("REST API Error: ~p ~p", [_Error, St]),
 		    {500, <<"internal_error">>}
 	    end;
         {error, Msg} ->

src/mod_muc_room.erl

@@ -54,6 +54,7 @@
 -include("xmpp.hrl").
 -include("translate.hrl").
 -include("mod_muc_room.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(MAX_USERS_DEFAULT_LIST,
 	[5, 10, 20, 30, 50, 100, 200, 500, 1000, 2000, 5000]).
@@ -2765,7 +2766,7 @@ process_item_change(Item, SD, UJID) ->
 		maybe_send_affiliation(JID, A, SD1),
 		SD1
 	end
-    catch E:R ->
+    catch ?EX_RULE(E, R, St) ->
 		FromSuffix = case UJID of
 			#jid{} ->
 				JidString = jid:encode(UJID),
@@ -2773,9 +2774,8 @@ process_item_change(Item, SD, UJID) ->
 			undefined ->
 				<<"">>
 		end,
-                St = erlang:get_stacktrace(),
 		?ERROR_MSG("failed to set item ~p~s: ~p",
-		       [Item, FromSuffix, {E, {R, St}}]),
+		       [Item, FromSuffix, {E, {R, ?EX_STACK(St)}}]),
 	    {error, xmpp:err_internal_server_error()}
     end.
 

src/mod_roster.erl

@@ -53,14 +53,11 @@
 	 depends/2]).
 
 -include("logger.hrl").
-
 -include("xmpp.hrl").
-
 -include("mod_roster.hrl").
-
 -include("ejabberd_http.hrl").
-
 -include("ejabberd_web_admin.hrl").
+-include("ejabberd_stacktrace.hrl").
 
 -define(ROSTER_CACHE, roster_cache).
 -define(ROSTER_ITEM_CACHE, roster_item_cache).
@@ -320,10 +317,9 @@ process_iq_get(#iq{to = To, lang = Lang,
 		   #roster_query{items = Items,
 				 ver = Version}
 	   end)
-    catch E:R ->
+    catch ?EX_RULE(E, R, St) ->
-            St = erlang:get_stacktrace(),
 	    ?ERROR_MSG("failed to process roster get for ~s: ~p",
-		       [jid:encode(To), {E, {R, St}}]),
+		       [jid:encode(To), {E, {R, ?EX_STACK(St)}}]),
 	    Txt = <<"Roster module has failed">>,
 	    xmpp:make_error(IQ, xmpp:err_internal_server_error(Txt, Lang))
     end.