diff options
| author | Anders Svensson <[email protected]> | 2014-11-03 02:07:58 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-11-03 12:09:16 +0100 |
| commit | c3b9ebc6cf9619c220b75601b8f02737052901b3 (patch) | |
| tree | 96e07bc0666a3776f5cdaa36a0565f8be1ce6cd6 | |
| parent | 743ed31108ee555db18d9833186865e85e34333e (diff) | |
| download | otp-c3b9ebc6cf9619c220b75601b8f02737052901b3.tar.gz otp-c3b9ebc6cf9619c220b75601b8f02737052901b3.tar.bz2 otp-c3b9ebc6cf9619c220b75601b8f02737052901b3.zip | |
Rename reconnect_timer to connect_timer in examples and suites
The timer was renamed in commit abea7186.
| -rw-r--r-- | lib/diameter/examples/code/peer.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/test/diameter_config_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/diameter/test/diameter_event_SUITE.erl | 6 | ||||
| -rw-r--r-- | lib/diameter/test/diameter_transport_SUITE.erl | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/diameter/examples/code/peer.erl b/lib/diameter/examples/code/peer.erl index b4ee17e4b7..7519abfb2c 100644 --- a/lib/diameter/examples/code/peer.erl +++ b/lib/diameter/examples/code/peer.erl @@ -74,7 +74,7 @@ start(Name, Opts) | {error, term()}. connect(Name, T) -> - diameter:add_transport(Name, {connect, [{reconnect_timer, 5000} + diameter:add_transport(Name, {connect, [{connect_timer, 5000} | client(T)]}). %% listen/2 diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl index d10ee83ba4..ad5b3f9420 100644 --- a/lib/diameter/test/diameter_config_SUITE.erl +++ b/lib/diameter/test/diameter_config_SUITE.erl @@ -157,7 +157,7 @@ {length_errors, [[exit], [handle], [discard]], [[x]]}, - {reconnect_timer, + {connect_timer, [[3000]], [[infinity]]}, {watchdog_timer, diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl index 94b4967921..64199895be 100644 --- a/lib/diameter/test/diameter_event_SUITE.erl +++ b/lib/diameter/test/diameter_event_SUITE.erl @@ -114,12 +114,12 @@ up(Config) -> %% Connect with non-matching capabilities and expect CEA from the peer %% to indicate as much and then for the transport to be restarted -%% (after reconnect_timer). +%% (after connect_timer). down(Config) -> {Svc, Ref} = connect(Config, [{capabilities, [{'Acct-Application-Id', [?DICT_ACCT:id()]}]}, {applications, [?DICT_ACCT]}, - {reconnect_timer, 5000}]), + {connect_timer, 5000}]), start = event(Svc), {closed, Ref, {'CEA', ?NO_COMMON_APP, _, #diameter_packet{}}, _} = event(Svc), @@ -129,7 +129,7 @@ down(Config) -> %% CEA and cause the client to timeout. cea_timeout(Config) -> {Svc, Ref} = connect(Config, [{capx_timeout, ?SERVER_CAPX_TMO div 2}, - {reconnect_timer, 2*?SERVER_CAPX_TMO}]), + {connect_timer, 2*?SERVER_CAPX_TMO}]), start = event(Svc), {closed, Ref, {'CEA', timeout}, _} = event(Svc). diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl index 9408fae62c..fcffa69c24 100644 --- a/lib/diameter/test/diameter_transport_SUITE.erl +++ b/lib/diameter/test/diameter_transport_SUITE.erl @@ -194,7 +194,7 @@ reconnect({connect, Ref}) -> true = diameter:subscribe(SvcName), ok = start_service(SvcName), [{{_, _, LRef}, Pid}] = diameter_reg:wait({?MODULE, Ref, '_'}), - CRef = ?util:connect(SvcName, tcp, LRef, [{reconnect_timer, 2000}, + CRef = ?util:connect(SvcName, tcp, LRef, [{connect_timer, 2000}, {watchdog_timer, 6000}]), %% Tell partner to kill transport after seeing that there are no |