erlang/otp deprecated erlang:get_stacktrace/0 function, use the funct…

…ion as platform version detected
alertlogic · Dec 3, 2018 · 70011b7 · 70011b7
1 parent ba8c2c5
commit 70011b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/include/exception.hrl b/include/exception.hrl
@@ -0,0 +1,7 @@
+-ifdef(OTP_RELEASE). %% this implies 21 or higher
+-define(EXCEPTION(Class, Reason, Stacktrace), Class:Reason:Stacktrace).
+-define(GET_STACK(Stacktrace), Stacktrace).
+-else.
+-define(EXCEPTION(Class, Reason, _), Class:Reason).
+-define(GET_STACK(_), erlang:get_stacktrace()).
+-endif.
diff --git a/src/erllambda.erl b/src/erllambda.erl
@@ -25,7 +25,8 @@
 %% private - handler invocation entry point, used by http api
 -export([invoke/3]).
 
--include("include/erllambda.hrl").
+-include("erllambda.hrl").
+-include("exception.hrl").
 -include_lib("erlcloud/include/erlcloud_aws.hrl").
 
 -ifdef(TEST).
@@ -315,8 +316,8 @@ invoke_exec( Handler, Event, Context ) ->
         % both top level handler and we can can call success/fail
         throw:{?MODULE, result, JsonMap} -> {ok, JsonMap};
         throw:{?MODULE, failure, JsonMap} -> {handled, JsonMap};
-        Type:Reason ->
-            Trace = erlang:get_stacktrace(),
+        ?EXCEPTION(Type, Reason, Stacktrace) ->
+            Trace = ?GET_STACK(Stacktrace),
             Message = format( "terminated with exception {~p, ~p}", [Type, Reason] ),
             message_send( format( "~s with trace ~p", [Message, Trace] ) ),
             Response = #{errorType => 'HandlerFailure',

diff --git a/src/erllambda_config_srv.erl b/src/erllambda_config_srv.erl
@@ -17,6 +17,7 @@
 -export([start_link/0]).
 
 -include("erllambda.hrl").
+-include("exception.hrl").
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 -endif.
@@ -152,9 +153,8 @@ serialize_run( Key, Generate ) ->
                                try
                                    Generate()
                                catch
-                                   Type:Reason ->
-                                       Trace = erlang:get_stacktrace(),
-                                       {error, {exception, Type, Reason, Trace}}
+                                   ?EXCEPTION(Type, Reason, Stacktrace) ->
+                                       {error, {exception, Type, Reason, ?GET_STACK(Stacktrace)}}
                                end,
                            Message = {complete, self(), Key, Result},
                            gen_server:cast( Parent, Message )