valitydev/kds
14
0
Fork 0
mirror of https://github.com/valitydev/kds.git synced 2024-11-06 00:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDS-101: Add filter for stacktrace (#20)

Browse Source
This commit is contained in:
ndiezel0 2020-02-25 18:38:58 +03:00 committed by GitHub
parent fa90b71efe
commit c51af554e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
apps/kds/src/kds_thrift_handler_utils.erl
View File

@ -18,7 +18,7 @@ filter_fun_exceptions(Fun) ->
error:{woody_error, _} = WoodyError:Stacktrace ->
erlang:raise(error, WoodyError, Stacktrace);
Class:Exception:Stacktrace ->
erlang:raise(Class, filter_error_reason(Exception), Stacktrace)
erlang:raise(Class, filter_error_reason(Exception), filter_stacktrace(Stacktrace))
end
end.
@ -33,19 +33,45 @@ raise(Exception) ->
% Known safe errors
filter_error_reason({hash_collision_detected, _Hash} = Reason) ->
Reason;
% Generic safe errors
filter_error_reason(Reason) when is_tuple(Reason) ->
erlang:list_to_tuple([filter_error_reason(R) || R <- erlang:tuple_to_list(Reason)]);
filter_error_reason(Reason) when is_list(Reason) ->
[filter_error_reason(R) || R <- Reason];
filter_error_reason(Reason) when is_map(Reason) ->
filter_error_reason(Reason) ->
filter(Reason).
filter_stacktrace(Stacktrace) when is_list(Stacktrace) ->
[filter_stacktrace_item(ST) || ST <- Stacktrace].
filter_stacktrace_item({Module, Function, Arity, Location} = ST) when
is_atom(Module) andalso
is_atom(Function) andalso
is_integer(Arity) andalso
is_list(Location)
->
ST;
filter_stacktrace_item({Module, Function, Args, Location}) when
is_atom(Module) andalso
is_atom(Function) andalso
is_list(Args) andalso
is_list(Location)
->
{Module, Function, filter_stacktrace_args(Args), Location};
filter_stacktrace_item(_) ->
'***'.
filter_stacktrace_args(Args) ->
filter(Args).
% Generic filter
filter(Reason) when is_tuple(Reason) ->
erlang:list_to_tuple([filter(R) || R <- erlang:tuple_to_list(Reason)]);
filter(Reason) when is_list(Reason) ->
[filter(R) || R <- Reason];
filter(Reason) when is_map(Reason) ->
maps:map(
fun(_Key, Value) ->
filter_error_reason(Value)
filter(Value)
end,
Reason
);
filter_error_reason(Reason) when
filter(Reason) when
is_atom(Reason) orelse
is_number(Reason) orelse
is_reference(Reason) orelse
@ -53,5 +79,5 @@ filter_error_reason(Reason) when
->
Reason;
% Other
filter_error_reason(_Reason) ->
filter(_Reason) ->
'***'.