mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-27 14:30:55 +02:00
Merge 1969 and 1970 from trunk.
* src/ejabberd_hooks.erl: anonymous functions support. SVN Revision: 2046
This commit is contained in:
parent
5afe7cfafb
commit
2908e5da19
@ -1,3 +1,7 @@
|
|||||||
|
2009-04-28 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
|
* src/ejabberd_hooks.erl: anonymous functions support.
|
||||||
|
|
||||||
2009-04-27 Badlop <badlop@process-one.net>
|
2009-04-27 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
* src/translate.erl: Support additional files (EJAB-925)
|
* src/translate.erl: Support additional files (EJAB-925)
|
||||||
|
@ -31,7 +31,9 @@
|
|||||||
|
|
||||||
%% External exports
|
%% External exports
|
||||||
-export([start_link/0,
|
-export([start_link/0,
|
||||||
|
add/3,
|
||||||
add/4,
|
add/4,
|
||||||
|
delete/3,
|
||||||
delete/4,
|
delete/4,
|
||||||
run/2,
|
run/2,
|
||||||
run_fold/3,
|
run_fold/3,
|
||||||
@ -58,6 +60,14 @@
|
|||||||
start_link() ->
|
start_link() ->
|
||||||
gen_server:start_link({local, ejabberd_hooks}, ejabberd_hooks, [], []).
|
gen_server:start_link({local, ejabberd_hooks}, ejabberd_hooks, [], []).
|
||||||
|
|
||||||
|
%% @spec (Hook::atom(), Function::function(), Seq::integer()) -> ok
|
||||||
|
%% @doc See add/4.
|
||||||
|
add(Hook, Function, Seq) when is_function(Function) ->
|
||||||
|
add(Hook, global, undefined, Function, Seq).
|
||||||
|
|
||||||
|
add(Hook, Host, Function, Seq) when is_function(Function) ->
|
||||||
|
add(Hook, Host, undefined, Function, Seq);
|
||||||
|
|
||||||
%% @spec (Hook::atom(), Module::atom(), Function::atom(), Seq::integer()) -> ok
|
%% @spec (Hook::atom(), Module::atom(), Function::atom(), Seq::integer()) -> ok
|
||||||
%% @doc Add a module and function to this hook.
|
%% @doc Add a module and function to this hook.
|
||||||
%% The integer sequence is used to sort the calls: low number is called before high number.
|
%% The integer sequence is used to sort the calls: low number is called before high number.
|
||||||
@ -68,6 +78,14 @@ add(Hook, Host, Module, Function, Seq)
|
|||||||
when is_binary(Host) orelse is_atom(Host) ->
|
when is_binary(Host) orelse is_atom(Host) ->
|
||||||
gen_server:call(ejabberd_hooks, {add, Hook, Host, Module, Function, Seq}).
|
gen_server:call(ejabberd_hooks, {add, Hook, Host, Module, Function, Seq}).
|
||||||
|
|
||||||
|
%% @spec (Hook::atom(), Function::function(), Seq::integer()) -> ok
|
||||||
|
%% @doc See del/4.
|
||||||
|
delete(Hook, Function, Seq) when is_function(Function) ->
|
||||||
|
delete(Hook, global, undefined, Function, Seq).
|
||||||
|
|
||||||
|
delete(Hook, Host, Function, Seq) when is_function(Function) ->
|
||||||
|
delete(Hook, Host, undefined, Function, Seq);
|
||||||
|
|
||||||
%% @spec (Hook::atom(), Module::atom(), Function::atom(), Seq::integer()) -> ok
|
%% @spec (Hook::atom(), Module::atom(), Function::atom(), Seq::integer()) -> ok
|
||||||
%% @doc Delete a module and function from this hook.
|
%% @doc Delete a module and function from this hook.
|
||||||
%% It is important to indicate exactly the same information than when the call was added.
|
%% It is important to indicate exactly the same information than when the call was added.
|
||||||
@ -202,7 +220,12 @@ code_change(_OldVsn, State, _Extra) ->
|
|||||||
run1([], _Hook, _Args) ->
|
run1([], _Hook, _Args) ->
|
||||||
ok;
|
ok;
|
||||||
run1([{_Seq, Module, Function} | Ls], Hook, Args) ->
|
run1([{_Seq, Module, Function} | Ls], Hook, Args) ->
|
||||||
case catch apply(Module, Function, Args) of
|
Res = if is_function(Function) ->
|
||||||
|
catch apply(Function, Args);
|
||||||
|
true ->
|
||||||
|
catch apply(Module, Function, Args)
|
||||||
|
end,
|
||||||
|
case Res of
|
||||||
{'EXIT', Reason} ->
|
{'EXIT', Reason} ->
|
||||||
?ERROR_MSG("~p~nrunning hook: ~p",
|
?ERROR_MSG("~p~nrunning hook: ~p",
|
||||||
[Reason, {Hook, Args}]),
|
[Reason, {Hook, Args}]),
|
||||||
@ -217,7 +240,12 @@ run1([{_Seq, Module, Function} | Ls], Hook, Args) ->
|
|||||||
run_fold1([], _Hook, Val, _Args) ->
|
run_fold1([], _Hook, Val, _Args) ->
|
||||||
Val;
|
Val;
|
||||||
run_fold1([{_Seq, Module, Function} | Ls], Hook, Val, Args) ->
|
run_fold1([{_Seq, Module, Function} | Ls], Hook, Val, Args) ->
|
||||||
case catch apply(Module, Function, [Val | Args]) of
|
Res = if is_function(Function) ->
|
||||||
|
catch apply(Function, [Val | Args]);
|
||||||
|
true ->
|
||||||
|
catch apply(Module, Function, [Val | Args])
|
||||||
|
end,
|
||||||
|
case Res of
|
||||||
{'EXIT', Reason} ->
|
{'EXIT', Reason} ->
|
||||||
?ERROR_MSG("~p~nrunning hook: ~p",
|
?ERROR_MSG("~p~nrunning hook: ~p",
|
||||||
[Reason, {Hook, Args}]),
|
[Reason, {Hook, Args}]),
|
||||||
|
Loading…
Reference in New Issue
Block a user