avoid node_call to break transaction (thanks to Karim Gemayel)(EJAB-1286)

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 731c8ab01832449f7d8a52905dcd6ba2ef85d2f0..919d2c3d0a7c5a7df45b000aab1e986d1c145de0 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -259,12 +259,17 @@ init_plugins(Host, ServerHost, Opts) ->
     Plugins = gen_mod:get_opt(plugins, Opts, [?STDNODE]),
     PepMapping = gen_mod:get_opt(pep_mapping, Opts, []),
     ?DEBUG("** PEP Mapping : ~p~n",[PepMapping]),
-    lists:foreach(fun(Name) ->
-                         ?DEBUG("** init ~s plugin",[Name]),
+    PluginsOK = lists:foldl(fun(Name, Acc) ->
                          Plugin = list_to_atom(?PLUGIN_PREFIX ++ Name),
-                         Plugin:init(Host, ServerHost, Opts)
-                 end, Plugins),
-    {Plugins, TreePlugin, PepMapping}.
+                         case catch apply(Plugin, init, [Host, ServerHost, Opts]) of
+                       {'EXIT', _Error} ->
+                           Acc;
+                       _ ->
+                           ?DEBUG("** init ~s plugin",[Name]),
+                           [Name | Acc]
+                         end
+               end, [], Plugins),
+    {PluginsOK, TreePlugin, PepMapping}.
 
 terminate_plugins(Host, ServerHost, Plugins, TreePlugin) ->
     lists:foreach(fun(Name) ->
@@ -3727,7 +3732,7 @@ tree_action(Host, Function, Args) ->
 node_call(Type, Function, Args) ->
     ?DEBUG("node_call ~p ~p ~p",[Type, Function, Args]),
     Module = list_to_atom(?PLUGIN_PREFIX++Type),
-    case catch apply(Module, Function, Args) of
+    case apply(Module, Function, Args) of
        {result, Result} -> {result, Result};
        {error, Error} -> {error, Error};
        {'EXIT', {undef, Undefined}} ->