diff options
| author | Anders Svensson <[email protected]> | 2013-03-18 19:29:36 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-18 19:29:36 +0100 |
| commit | 0c713345472e69bc1b31e81306e5e2c6dd061653 (patch) | |
| tree | ac4b9e23a55e1d58152deb98a72750448dab8ff8 /lib/diameter/src/base/diameter_config.erl | |
| parent | 4c13ffc749b4953a6aba519eccf13a2085f91bf9 (diff) | |
| parent | 4ac5deb44293aa78ee53dae0e190733442a2c6c6 (diff) | |
| download | otp-0c713345472e69bc1b31e81306e5e2c6dd061653.tar.gz otp-0c713345472e69bc1b31e81306e5e2c6dd061653.tar.bz2 otp-0c713345472e69bc1b31e81306e5e2c6dd061653.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index 9f73815756..3a2e0d2140 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -573,7 +573,6 @@ make_config(SvcName, Opts) -> {false, monitor}, {?NOMASK, sequence}, {nodes, restrict_connections}]), - %% share_peers and use_shared_peers are currently undocumented. #service{name = SvcName, rec = #diameter_service{applications = Apps, @@ -588,23 +587,31 @@ opt(K, false = B) B; opt(K, true = B) - when K == share_peer; + when K == share_peers; K == use_shared_peers -> B; -opt(monitor, P) - when is_pid(P) -> - P; - opt(restrict_connections, T) when T == node; - T == nodes; - T == []; - is_atom(hd(T)) -> + T == nodes -> + T; + +opt(K, T) + when (K == share_peers + orelse K == use_shared_peers + orelse K == restrict_connections), ([] == T + orelse is_atom(hd(T))) -> T; -opt(restrict_connections = K, F) -> - try diameter_lib:eval(F) of %% no guarantee that it won't fail later +opt(monitor, P) + when is_pid(P) -> + P; + +opt(K, F) + when K == restrict_connections; + K == share_peers; + K == use_shared_peers -> + try diameter_lib:eval(F) of %% but no guarantee that it won't fail later Nodes when is_list(Nodes) -> F; V -> |