aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter_config.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-06-11 12:19:55 +0200
committerAnders Svensson <[email protected]>2013-06-11 12:19:55 +0200
commit69694acdab4391ef3a10c1e9d8130a1cf39beb4a (patch)
treeafa5e56adaa9e0437470d45e3966b48237997102 /lib/diameter/src/base/diameter_config.erl
parentc80d324e1eeb34129e63e10b00cff688988b0296 (diff)
parent78b3dc6eea23a728a20947ccc425a7860ef39d97 (diff)
downloadotp-69694acdab4391ef3a10c1e9d8130a1cf39beb4a.tar.gz
otp-69694acdab4391ef3a10c1e9d8130a1cf39beb4a.tar.bz2
otp-69694acdab4391ef3a10c1e9d8130a1cf39beb4a.zip
Merge branch 'anders/diameter/request_spawn/OTP-11060' into maint
* anders/diameter/request_spawn/OTP-11060: Make spawn options for request processes configurable
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
-rw-r--r--lib/diameter/src/base/diameter_config.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 2a145c874b..fc5c284bf2 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -549,6 +549,9 @@ opt({watchdog_timer, Tmo}) ->
opt({watchdog_config, L}) ->
is_list(L) andalso lists:all(fun wdopt/1, L);
+opt({spawn_opt, Opts}) ->
+ is_list(Opts);
+
%% Options that we can't validate.
opt({K, _})
when K == transport_config;
@@ -632,7 +635,8 @@ make_config(SvcName, Opts) ->
{false, use_shared_peers},
{false, monitor},
{?NOMASK, sequence},
- {nodes, restrict_connections}]),
+ {nodes, restrict_connections},
+ {[], spawn_opt}]),
#service{name = SvcName,
rec = #diameter_service{applications = Apps,
@@ -647,6 +651,9 @@ make_opts(Opts, Defs) ->
[{K, opt(K,V)} || {K,V} <- Known].
+opt(spawn_opt, L) ->
+ is_list(L);
+
opt(K, false = B)
when K /= sequence ->
B;