diff options
| author | Anders Svensson <[email protected]> | 2013-03-27 18:09:09 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-27 18:09:09 +0100 |
| commit | a3054e29956b5da4c5b56d83edcd15b6648b3958 (patch) | |
| tree | a5bb1faeeb2780e0c82a897ea17c74191f7c2f08 /lib/diameter/src/base/diameter_watchdog.erl | |
| parent | 8ee91691c3d53485f9a63d8194160a1af6dd22d6 (diff) | |
| parent | 49040f8be249501331abc3830dfe91344fd0f988 (diff) | |
| download | otp-a3054e29956b5da4c5b56d83edcd15b6648b3958.tar.gz otp-a3054e29956b5da4c5b56d83edcd15b6648b3958.tar.bz2 otp-a3054e29956b5da4c5b56d83edcd15b6648b3958.zip | |
Merge branch 'anders/diameter/app_not_configured/OTP-10972' into maint
* anders/diameter/app_not_configured/OTP-10972:
Fix faulty sequence validation
Add config suite
Deal with config errors detected at transport start less brutally
Move most transport_opt() validation into diameter_config
Minor doc/spec fix
Minor diameter_lib cleanup
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index 82ca603cf3..41c493ff20 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -158,7 +158,7 @@ wait(Ref, Pid) -> config(Opts) -> Config = proplists:get_value(watchdog_config, Opts, []), is_list(Config) orelse config_error({watchdog_config, Config}), - lists:foldl(fun config/2, #config{}, Config). + lists:foldl(fun config/2, #config{}, Config). %% ^ added in old code config({suspect, N}, Rec) when ?IS_NATURAL(N) -> @@ -168,7 +168,7 @@ config({okay, N}, Rec) when ?IS_NATURAL(N) -> Rec#config{okay = N}; -config(T, _) -> +config(T, _) -> %% added in old code config_error(T). %% start/5 @@ -225,7 +225,8 @@ dict0(_, _, Acc) -> Acc. config_error(T) -> - ?ERROR({configuration_error, T}). + diameter_lib:error_report(configuration_error, T), + exit({shutdown, {configuration_error, T}}). %% handle_call/3 |