Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Merge pull request #2551 from MarcelWaldvogel/configurable-extauth-pool 

Make it possible to join extauth pools
This commit is contained in:
Evgeny Khramtsov 2018-07-31 07:52:06 +03:00 committed by GitHub
parent efb4fd0d10 9b48dc9cc3
commit b56c012407
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_auth_external.erl
View File

@ -118,9 +118,11 @@ opt_type(extauth_instances) ->
fun (V) when is_integer(V), V > 0 -> V end;
opt_type(extauth_program) ->
fun (V) -> binary_to_list(iolist_to_binary(V)) end;
opt_type(extauth_pool_name) ->
fun (V) -> iolist_to_binary(V) end;
opt_type(extauth_pool_size) ->
fun(I) when is_integer(I), I>0 -> I end;
opt_type(_) ->
[extauth_program, extauth_pool_size,
[extauth_program, extauth_pool_size, extauth_pool_name,
%% Deprecated:
extauth_cache, extauth_instances].

7
src/extauth.erl
View File

@ -82,7 +82,12 @@ prog_name(Host) ->
-spec pool_name(binary()) -> atom().
pool_name(Host) ->
list_to_atom("extauth_pool_" ++ binary_to_list(Host)).
case ejabberd_config:get_option({extauth_pool_name, Host}) of
undefined ->
list_to_atom("extauth_pool_" ++ binary_to_list(Host));
Name ->
list_to_atom("extauth_pool_" ++ binary_to_list(Name))
end.
-spec worker_name(atom(), integer()) -> atom().
worker_name(Pool, N) ->