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

AAA-54: Improvements (#116)

Browse Source 
* Pass union value properly

* Fix exception handling for simple benary messages

* Fix and cleanup test

* Add missing format_as_exception to meta_client()

* Typo

* Remove debug code

* Rework maps formatting

* Introduce thrift's void

* Typo

* Retuen Value for void type
This commit is contained in:
Sergey Yelin 2019-12-09 12:22:41 +03:00 committed by GitHub
parent 068bc4b3b7
commit b48a03ffaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/woody_event_formatter.erl
View File

@ -105,7 +105,7 @@ format_exception(_Module, _Service, _Function, Value, Opts) ->
#{max_length := ML} = normalize_options(Opts),
{"~s", [io_lib:format("~w", [Value], [{chars_limit, ML}])]}.
format(ReplyType, Value, #{max_length := ML} = Opts) when is_tuple(Value) ->
format(ReplyType, Value, #{max_length := ML} = Opts) ->
try
{ReplyFmt, _} = format_thrift_value(ReplyType, Value, 0, 0, Opts),
{"~s", [ReplyFmt]}
@ -114,12 +114,17 @@ format(ReplyType, Value, #{max_length := ML} = Opts) when is_tuple(Value) ->
WarningDetails = genlib_format:format_exception({E, R, S}),
logger:warning("EVENT FORMATTER ERROR: ~p", [WarningDetails]),
{"~s", [io_lib:format("~w", [Value], [{chars_limit, ML}])]}
end;
format(_ReplyType, Value, #{max_length := ML}) ->
{"~s", [io_lib:format("~w", [Value], [{chars_limit, ML}])]}.
end.
-spec format_thrift_value(term(), term(), non_neg_integer(), non_neg_integer(), opts()) ->
{iolist(), non_neg_integer()}.
format_thrift_value({struct, struct, []}, Value, _CurDepth, CL, Opts) ->
%% {struct,struct,[]} === thrift's void
%% so just return Value
#{max_length := ML} = normalize_options(Opts),
ValueString = io_lib:format("~w", [Value], [{chars_limit, ML}]),
Length = length(ValueString),
{ValueString, CL + Length};
format_thrift_value({struct, struct, {Module, Struct}}, Value, CurDepth, CL, Opts) ->
format_struct(Module, Struct, Value, CurDepth + 1, CL, Opts);
format_thrift_value({struct, union, {Module, Struct}}, Value, CurDepth, CL, Opts) ->
@ -161,9 +166,8 @@ format_thrift_value({map, _}, _, CurDepth, CL, #{max_depth := MD})
when MD >= 0, CurDepth >= MD ->
{"#{...}", CL + 6}; %% 6 = length("#{...}")
format_thrift_value({map, KeyType, ValueType}, Map, CurDepth, CL, Opts) ->
MapData = maps:to_list(Map),
{Params, CL1} =
format_map(KeyType, ValueType, MapData, "", CurDepth + 1, CL + 3, Opts, false),
format_map(KeyType, ValueType, Map, "", CurDepth + 1, CL + 3, Opts, false),
{["#{", Params, "}"], CL1};
format_thrift_value(bool, false, _CurDepth, CL, _Opts) ->
{"false", CL + 5};
@ -214,6 +218,7 @@ format_list_result(false, _, _, Fmt, CL) ->
{Fmt, CL + 5}.
format_thrift_set(Type, SetofValues, CurDepth, CL, Opts) ->
%% Actually ordsets is a list so leave this implementation as-is
ValueList = ordsets:to_list(SetofValues),
format_list(Type, ValueList, "", CurDepth, CL, Opts, false).
@ -395,9 +400,13 @@ format_list(Type, [Entry | ValueList], AccFmt, CurDepth, CL, Opts, IsFirst) ->
stop_format(Result, CL1, MaybeAddMoreMarker)
end.
format_map(_KeyType, _ValueType, [], Result, _CurDepth, CL, _Opts, _AddDelimiter) ->
format_map(_KeyType, _ValueType, E, Result, _CurDepth, CL, _Opts, _AddDelimiter) when map_size(E) =:= 0 ->
{Result, CL};
format_map(KeyType, ValueType, [{Key, Value} | MapData], AccFmt, CurDepth, CL, Opts, AddDelimiter) ->
format_map(KeyType, ValueType, Map, AccFmt, CurDepth, CL, Opts, AddDelimiter) ->
MapIterator = maps:iterator(Map),
format_map_(KeyType, ValueType, maps:next(MapIterator), AccFmt, CurDepth, CL, Opts, AddDelimiter).
format_map_(KeyType, ValueType, {Key, Value, MapIterator}, AccFmt, CurDepth, CL, Opts, AddDelimiter) ->
{KeyFmt, CL1} = format_thrift_value(KeyType, Key, CurDepth, CL, Opts),
{ValueFmt, CL2} = format_thrift_value(ValueType, Value, CurDepth, CL1, Opts),
#{max_length := ML} = Opts,
@ -407,15 +416,18 @@ format_map(KeyType, ValueType, [{Key, Value} | MapData], AccFmt, CurDepth, CL, O
DelimiterLen = length(Delimiter),
NewCL = CL2 + MapStrLen + DelimiterLen,
Result = [AccFmt | [Delimiter, KeyFmt, MapStr, ValueFmt]],
Next = maps:next(MapIterator),
case NewCL of
NewCL when ML < 0 ->
format_map(KeyType, ValueType, MapData, Result, CurDepth, NewCL, Opts, true);
format_map_(KeyType, ValueType, Next, Result, CurDepth, NewCL, Opts, true);
NewCL when NewCL =< ML ->
format_map(KeyType, ValueType, MapData, Result, CurDepth, NewCL, Opts, true);
format_map_(KeyType, ValueType, Next, Result, CurDepth, NewCL, Opts, true);
NewCL ->
MaybeAddMoreMarker = MapData =/= [],
MaybeAddMoreMarker = Next =/= none,
stop_format(Result, NewCL, MaybeAddMoreMarker)
end.
end;
format_map_(_, _, _, AccFmt, _, CL, _, _) ->
{AccFmt, CL}.
stop_format(Result, CL1, MaybeAddMoreMarker) ->
Delimiter1 = maybe_add_delimiter(MaybeAddMoreMarker),

2
src/woody_event_handler.erl
View File

@ -329,7 +329,7 @@ format_service_request(#{service_schema := {Module, Service}, function:=Function
-spec format_service_reply(map(), options()) ->
msg().
format_service_reply(#{service_schema := {Module, Service}, function:=Function, result:=Result} = Meta, Opts) ->
format_service_reply(#{service_schema := {Module, Service}, function := Function, result := Result} = Meta, Opts) ->
FormatasException = maps:get(format_as_exception, Meta, false),
case FormatasException of
false ->