aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorAnders Svensson <anders@erlang.org>2013-09-09 13:57:00 +0200
committerAnders Svensson <anders@erlang.org>2013-09-09 13:57:00 +0200
commitac54f126d0a8aa4e7f5a7cf2e445d18e77443e30 (patch)
treefaccd82f452ec29863c8bad729b40085701c4d0b /lib/diameter
parent9ffe1845cfe51163f6c36f5918e9d147a2bfbef8 (diff)
parentc01e53a7caaa11c0745f4e0ce30df387b55f435b (diff)
downloadotp-ac54f126d0a8aa4e7f5a7cf2e445d18e77443e30.tar.gz
otp-ac54f126d0a8aa4e7f5a7cf2e445d18e77443e30.tar.bz2
otp-ac54f126d0a8aa4e7f5a7cf2e445d18e77443e30.zip
Merge branch 'anders/diameter/spawn_opt/OTP-11299' into maint
* anders/diameter/spawn_opt/OTP-11299: Fix broken spawn_opt
Diffstat (limited to 'lib/diameter')
-rw-r--r--lib/diameter/src/base/diameter_config.erl5
-rw-r--r--lib/diameter/src/base/diameter_service.erl3
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index fc5c284bf2..34b40c3a29 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -651,8 +651,9 @@ make_opts(Opts, Defs) ->
[{K, opt(K,V)} || {K,V} <- Known].
-opt(spawn_opt, L) ->
- is_list(L);
+opt(spawn_opt, L)
+ when is_list(L) ->
+ L;
opt(K, false = B)
when K /= sequence ->
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 9dd8aafc61..47e03cd0a0 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -673,7 +673,8 @@ service_options(Opts) ->
{use_shared_peers, get_value(use_shared_peers, Opts)},
{restrict_connections, proplists:get_value(restrict_connections,
Opts,
- ?RESTRICT)}].
+ ?RESTRICT)},
+ {spawn_opt, proplists:get_value(spawn_opt, Opts, [])}].
%% The order of options is significant since we match against the list.
mref(false = No) ->