diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-30 19:01:47 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-04-30 19:01:47 +0300 |
| commit | fddd6110e00df12c99a20a2cc9d074f5f4f1f965 (patch) | |
| tree | 366575b855f1b2013db7eeb02ecb213f81c98c1f /src/mod_multicast.erl | |
| parent | Merge branch 'new-option-validation' (diff) | |
Don't validate an option in gen_mod:get*opt() functions
The changes are very similar to those from previous commit:
* Now there is no need to pass validating function in
gen_mod:get_opt() and gen_mod:get_module_opt() functions,
because the modules' configuration keeps already validated values.
* New functions gen_mod:get_opt/2 and gen_mod:get_module_opt/3 are
introduced.
* Functions gen_mod:get_opt/4 and get_module_opt/5 are deprecated.
If the functions are still called, the "function" argument is
simply ignored.
* Validating callback Mod:listen_opt_type/1 is introduced to validate
listening options at startup.
Diffstat (limited to 'src/mod_multicast.erl')
| -rw-r--r-- | src/mod_multicast.erl | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl index 4f4f96614..d2627c252 100644 --- a/src/mod_multicast.erl +++ b/src/mod_multicast.erl @@ -134,14 +134,8 @@ init([LServerS, Opts]) -> process_flag(trap_exit, true), LServiceS = gen_mod:get_opt_host(LServerS, Opts, <<"multicast.@HOST@">>), - Access = gen_mod:get_opt(access, Opts, - fun acl:access_rules_validator/1, all), - SLimits = - build_service_limit_record(gen_mod:get_opt(limits, Opts, - fun (A) when is_list(A) -> - A - end, - [])), + Access = gen_mod:get_opt(access, Opts, all), + SLimits = build_service_limit_record(gen_mod:get_opt(limits, Opts, [])), create_cache(), try_start_loop(), create_pool(), @@ -156,14 +150,8 @@ handle_call(stop, _From, State) -> handle_cast({reload, NewOpts, NewOpts}, #state{lserver = LServerS, lservice = OldLServiceS} = State) -> - Access = gen_mod:get_opt(access, NewOpts, - fun acl:access_rules_validator/1, all), - SLimits = - build_service_limit_record(gen_mod:get_opt(limits, NewOpts, - fun (A) when is_list(A) -> - A - end, - [])), + Access = gen_mod:get_opt(access, NewOpts, all), + SLimits = build_service_limit_record(gen_mod:get_opt(limits, NewOpts, [])), NewLServiceS = gen_mod:get_opt_host(LServerS, NewOpts, <<"multicast.@HOST@">>), if NewLServiceS /= OldLServiceS -> |