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

HG-40: Fix interoperability with respect to scoped record names (#6)

Browse Source 
* HG-40: Fix interoperability with respect to scoped record names

* HG-40: Provide build container with the newest thrift compiler
This commit is contained in:
Andrew Mayorov 2016-07-06 17:02:08 +03:00 committed by GitHub
parent c80d54c774
commit 302e829154
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.lock
View File

@ -17,5 +17,5 @@
{<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.0">>},1}, {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.0">>},1},
{<<"thrift">>, {<<"thrift">>,
{git,"https://github.com/rbkmoney/thrift_erlang.git", {git,"https://github.com/rbkmoney/thrift_erlang.git",
{ref,"a517cf67e2ba7458db498cad3ca0a983f834cc7e"}}, {ref,"1978d5a1e350694bfa3d2dc3a762176bc60c6e64"}},
0}]. 0}].

11
src/woody_server_thrift_handler.erl
View File

@ -233,12 +233,13 @@ handle_exception(State = #state{service = Service, transport_handler = Trans},
{ReplySpec, ExceptionTuple}, SeqId) {ReplySpec, ExceptionTuple}, SeqId)
end. end.
get_except(Exception, {_Fid, _, {struct, exception, {Module, Type}}, _, _}, _) when get_except(Exception, {_Fid, _, {struct, exception, {Module, Type}}, _, _}, TypesModule) ->
element(1, Exception) =:= Type case Module:record_name(Type) of
-> Name when Name =:= element(1, Exception) ->
{Exception, {Module, Type}}; {Exception, {Module, Type}};
get_except(_, _, TypesModule) -> _ ->
{undefined, TypesModule}. {undefined, TypesModule}
end.
get_except_name(Module, Type) -> get_except_name(Module, Type) ->
{struct, exception, Fields} = Module:struct_info(Type), {struct, exception, Fields} = Module:struct_info(Type),

2
wercker.yml
View File

@ -1,5 +1,5 @@
box: box:
id: rbkmoney/build_erlang id: rbkmoney/build
username: $USERNAME username: $USERNAME
password: $PASSWORD password: $PASSWORD
tag: latest tag: latest