From 52d0997f388fff97c5d829dc69d6da4946e28182 Mon Sep 17 00:00:00 2001 From: Rustem Shaydullin Date: Mon, 27 Jan 2020 16:40:48 +0300 Subject: [PATCH] MG-175: Upgrade woody --- apps/ff_cth/src/ct_helper.erl | 14 ++++++++++++-- config/sys.config | 28 ++++++++++++++++++++-------- rebar.lock | 12 +++++++++++- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/apps/ff_cth/src/ct_helper.erl b/apps/ff_cth/src/ct_helper.erl index 1067892..5b7ff92 100644 --- a/apps/ff_cth/src/ct_helper.erl +++ b/apps/ff_cth/src/ct_helper.erl @@ -77,10 +77,20 @@ start_app(woody = AppName) -> start_app(dmt_client = AppName) -> {start_app_with(AppName, [ - {cache_update_interval, 500}, + {cache_update_interval, 500}, % milliseconds {max_cache_size, #{ - elements => 1 + elements => 20, + memory => 52428800 % 50Mb }}, + {woody_event_handlers, [ + {scoper_woody_event_handler, #{ + event_handler_opts => #{ + formatter_opts => #{ + max_length => 1000 + } + } + }} + ]}, {service_urls, #{ 'Repository' => <<"http://dominant:8022/v1/domain/repository">>, 'RepositoryClient' => <<"http://dominant:8022/v1/domain/repository_client">> diff --git a/config/sys.config b/config/sys.config index 572fc84..12ef0e8 100644 --- a/config/sys.config +++ b/config/sys.config @@ -19,9 +19,20 @@ ]}, {dmt_client, [ + {cache_update_interval, 5000}, % milliseconds {max_cache_size, #{ - elements => 1 + elements => 20, + memory => 52428800 % 50Mb }}, + {woody_event_handlers, [ + {scoper_woody_event_handler, #{ + event_handler_opts => #{ + formatter_opts => #{ + max_length => 1000 + } + } + }} + ]}, {service_urls, #{ 'Repository' => <<"http://dominant:8022/v1/domain/repository">>, 'RepositoryClient' => <<"http://dominant:8022/v1/domain/repository_client">> @@ -36,7 +47,13 @@ cache_mode => safe, % disabled | safe | aggressive options => #{ woody_client => #{ - event_handler => scoper_woody_event_handler + event_handler => {scoper_woody_event_handler, #{ + event_handler_opts => #{ + formatter_opts => #{ + max_length => 1000 + } + } + }} } } }} @@ -140,12 +157,7 @@ {ff_server, [ {ip, "::"}, {port, 8022}, - {woody_opts, #{ - net_opts => [ - % Bump keepalive timeout up to a minute - {timeout, 60000} - ] - }}, + {default_woody_handling_timeout, 30000}, {net_opts, [ % Bump keepalive timeout up to a minute {timeout, 60000} diff --git a/rebar.lock b/rebar.lock index bfa1132..6f802bc 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,5 +1,6 @@ {"1.1.0", [{<<"base64url">>,{pkg,<<"base64url">>,<<"0.0.1">>},0}, + {<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},3}, {<<"bender_client">>, {git,"git@github.com:rbkmoney/bender_client_erlang.git", {ref,"35c34ea7ee2c00c4d7554e16704889fe2b6eba34"}}, @@ -60,6 +61,10 @@ {git,"git@github.com:rbkmoney/fistful-reporter-proto.git", {ref,"8bec5e6c08c8b43ba606a62fa65d164b07d3de96"}}, 0}, + {<<"folsom">>, + {git,"git@github.com:folsom-project/folsom.git", + {ref,"9309bad9ffadeebbefe97521577c7480c7cfcd8a"}}, + 2}, {<<"genlib">>, {git,"https://github.com/rbkmoney/genlib.git", {ref,"673d5d3ceb58a94e39ad2df418309c995ec36ac1"}}, @@ -70,6 +75,10 @@ {ref,"e7dd9f227e46979d8073e71c683395a809b78cb4"}}, 1}, {<<"hackney">>,{pkg,<<"hackney">>,<<"1.15.1">>},0}, + {<<"how_are_you">>, + {git,"https://github.com/rbkmoney/how_are_you.git", + {ref,"2bb46054e16aaba9357747cc72b7c42e1897a56d"}}, + 1}, {<<"id_proto">>, {git,"git@github.com:rbkmoney/identification-proto.git", {ref,"1ccb06388c9d717e942046facaf32c0c816d6f69"}}, @@ -143,7 +152,7 @@ {<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.7.3">>},0}, {<<"woody">>, {git,"git@github.com:rbkmoney/woody_erlang.git", - {ref,"5ee89dd0b2d52ff955a4107a8d9dc0f8fdd365a0"}}, + {ref,"ce178d0232c2e7b710ab41a9b1b7d0ca912b2932"}}, 0}, {<<"woody_user_identity">>, {git,"git@github.com:rbkmoney/woody_erlang_user_identity.git", @@ -152,6 +161,7 @@ [ {pkg_hash,[ {<<"base64url">>, <<"36A90125F5948E3AFD7BE97662A1504B934DD5DAC78451CA6E9ABF85A10286BE">>}, + {<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>}, {<<"cache">>, <<"3C11DBF4CD8FCD5787C95A5FB2A04038E3729CFCA0386016EEA8C953AB48A5AB">>}, {<<"certifi">>, <<"867CE347F7C7D78563450A18A6A28A8090331E77FA02380B4A21962A65D36EE5">>}, {<<"cowboy">>, <<"99AA50E94E685557CAD82E704457336A453D4ABCB77839AD22DBE71F311FCC06">>},