diff options
| author | Anders Svensson <[email protected]> | 2017-08-23 12:21:14 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-08-25 13:08:41 +0200 |
| commit | 5f3becaddef9b18c81a1ec8bd7bf955384c1a225 (patch) | |
| tree | 23b87c1dd78c561c51c9bf534e7b7b479c9d4c44 /lib/diameter/src/base/diameter_watchdog.erl | |
| parent | 2d540b95755a6f628b0cfc5a9bab4ff41046fe4b (diff) | |
| download | otp-5f3becaddef9b18c81a1ec8bd7bf955384c1a225.tar.gz otp-5f3becaddef9b18c81a1ec8bd7bf955384c1a225.tar.bz2 otp-5f3becaddef9b18c81a1ec8bd7bf955384c1a225.zip | |
Let a service configure default transport options
Only a default spawn_opt has been possible to configure, but there's
no reason why most others should need to be configured per transport.
Those options that still only make sense on a transport are
transport_module/config (because of the semantics of multiple values),
applications/capabilities (since these override service options), and
private (since it's only to allow user-specific options in a backwards
compatible way).
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index b2172356ee..bb671e9860 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -76,10 +76,8 @@ string_decode := false, strict_arities => diameter:strict_arities(), strict_mbit := boolean(), - failed_avp := false, rfc := 3588 | 6733, - ordered_encode := false, - incoming_maxlen := diameter:message_length()}, + ordered_encode := false}, shutdown = false :: boolean()}). %% --------------------------------------------------------------------------- @@ -137,15 +135,6 @@ i({Ack, T, Pid, {Opts, putr(restart, {T, Opts, Svc, SvcOpts}), %% save seeing it in trace putr(dwr, dwr(Caps)), %% Nodes = restrict_nodes(Restrict), - CodecKeys = [decode_format, - string_decode, - strict_arities, - strict_mbit, - incoming_maxlen, - spawn_opt, - rfc, - ordered_encode], - #watchdog{parent = Pid, transport = start(T, Opts, SvcOpts, Nodes, Dict0, Svc), tw = proplists:get_value(watchdog_timer, @@ -153,13 +142,21 @@ i({Ack, T, Pid, {Opts, ?DEFAULT_TW_INIT), receive_data = RecvData, dictionary = Dict0, - config = - maps:without([traffic_counters | CodecKeys], - config(SvcOpts#{restrict => restrict(Nodes), - suspect => 1, - okay => 3}, - Opts)), - codec = maps:with(CodecKeys -- [strict_arities], + config = maps:with([sequence, + restrict_connections, + restrict, + suspect, + okay], + config(SvcOpts#{restrict => restrict(Nodes), + suspect => 1, + okay => 3}, + Opts)), + codec = maps:with([decode_format, + strict_arities, + strict_mbit, + string_decode, + rfc, + ordered_encode], SvcOpts#{decode_format := false, string_decode := false, ordered_encode => false})}. |