From f00725dffb2c435fe308171d6d1cecc8659ae081 Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Thu, 31 Jul 2014 14:25:37 +0400 Subject: [PATCH] mod_offline now uses gen_server --- src/mod_offline.erl | 122 ++++++++++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 38 deletions(-) diff --git a/src/mod_offline.erl b/src/mod_offline.erl index f6870adc0..bb488f8c5 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -26,13 +26,15 @@ -module(mod_offline). -author('alexey@process-one.net'). +-define(GEN_SERVER, p1_server). +-behaviour(?GEN_SERVER). -behaviour(gen_mod). -export([count_offline_messages/2]). -export([start/2, - loop/2, + start_link/2, stop/1, store_packet/3, resend_offline_messages/2, @@ -50,6 +52,10 @@ webadmin_user/4, webadmin_user_parse_query/5]). +%% gen_server callbacks +-export([init/1, handle_call/3, handle_cast/2, + handle_info/2, terminate/2, code_change/3]). + -include("ejabberd.hrl"). -include("logger.hrl"). @@ -67,6 +73,10 @@ to = #jid{} :: jid() | '_', packet = #xmlel{} :: xmlel() | '_'}). +-record(state, + {host = <<"">> :: binary(), + access_max_offline_messages}). + -define(PROCNAME, ejabberd_offline). -define(OFFLINE_TABLE_LOCK_THRESHOLD, 1000). @@ -74,7 +84,29 @@ %% default value for the maximum number of user messages -define(MAX_USER_MESSAGES, infinity). +start_link(Host, Opts) -> + Proc = gen_mod:get_module_proc(Host, ?PROCNAME), + ?GEN_SERVER:start_link({local, Proc}, ?MODULE, + [Host, Opts], []). + start(Host, Opts) -> + Proc = gen_mod:get_module_proc(Host, ?PROCNAME), + ChildSpec = {Proc, {?MODULE, start_link, [Host, Opts]}, + temporary, 1000, worker, [?MODULE]}, + supervisor:start_child(ejabberd_sup, ChildSpec). + +stop(Host) -> + Proc = gen_mod:get_module_proc(Host, ?PROCNAME), + ?GEN_SERVER:call(Proc, stop), + supervisor:delete_child(ejabberd_sup, Proc), + ok. + + +%%==================================================================== +%% gen_server callbacks +%%==================================================================== + +init([Host, Opts]) -> case gen_mod:db_type(Opts) of mnesia -> mnesia:create_table(offline_msg, @@ -102,22 +134,57 @@ start(Host, Opts) -> ejabberd_hooks:add(webadmin_user_parse_query, Host, ?MODULE, webadmin_user_parse_query, 50), AccessMaxOfflineMsgs = gen_mod:get_opt(access_max_user_messages, Opts, fun(A) -> A end, max_user_offline_messages), - register(gen_mod:get_module_proc(Host, ?PROCNAME), - spawn(?MODULE, loop, [Host, AccessMaxOfflineMsgs])). + {ok, + #state{host = Host, + access_max_offline_messages = AccessMaxOfflineMsgs}}. + + +handle_call(stop, _From, State) -> + {stop, normal, ok, State}. + + +handle_cast(_Msg, State) -> {noreply, State}. + + +handle_info(#offline_msg{us = UserServer} = Msg, State) -> + #state{host = Host, + access_max_offline_messages = AccessMaxOfflineMsgs} = State, + DBType = gen_mod:db_type(Host, ?MODULE), + Msgs = receive_all(UserServer, [Msg], DBType), + Len = length(Msgs), + MaxOfflineMsgs = get_max_user_messages(AccessMaxOfflineMsgs, + UserServer, Host), + store_offline_msg(Host, UserServer, Msgs, Len, MaxOfflineMsgs, DBType), + {noreply, State}; + +handle_info(_Info, State) -> + ?ERROR_MSG("got unexpected info: ~p", [_Info]), + {noreply, State}. + + +terminate(_Reason, State) -> + Host = State#state.host, + ejabberd_hooks:delete(offline_message_hook, Host, + ?MODULE, store_packet, 50), + ejabberd_hooks:delete(resend_offline_messages_hook, + Host, ?MODULE, pop_offline_messages, 50), + ejabberd_hooks:delete(remove_user, Host, ?MODULE, + remove_user, 50), + ejabberd_hooks:delete(anonymous_purge_hook, Host, + ?MODULE, remove_user, 50), + ejabberd_hooks:delete(disco_sm_features, Host, ?MODULE, get_sm_features, 50), + ejabberd_hooks:delete(disco_local_features, Host, ?MODULE, get_sm_features, 50), + ejabberd_hooks:delete(webadmin_page_host, Host, + ?MODULE, webadmin_page, 50), + ejabberd_hooks:delete(webadmin_user, Host, + ?MODULE, webadmin_user, 50), + ejabberd_hooks:delete(webadmin_user_parse_query, Host, + ?MODULE, webadmin_user_parse_query, 50), + ok. + + +code_change(_OldVsn, State, _Extra) -> {ok, State}. -loop(Host, AccessMaxOfflineMsgs) -> - receive - #offline_msg{us = UserServer} = Msg -> - DBType = gen_mod:db_type(Host, ?MODULE), - Msgs = receive_all(UserServer, [Msg], DBType), - Len = length(Msgs), - MaxOfflineMsgs = get_max_user_messages(AccessMaxOfflineMsgs, - UserServer, Host), - store_offline_msg(Host, UserServer, Msgs, Len, MaxOfflineMsgs, DBType), - loop(Host, AccessMaxOfflineMsgs); - _ -> - loop(Host, AccessMaxOfflineMsgs) - end. store_offline_msg(_Host, US, Msgs, Len, MaxOfflineMsgs, mnesia) -> @@ -212,28 +279,7 @@ receive_all(US, Msgs, DBType) -> end end. -stop(Host) -> - ejabberd_hooks:delete(offline_message_hook, Host, - ?MODULE, store_packet, 50), - ejabberd_hooks:delete(resend_offline_messages_hook, - Host, ?MODULE, pop_offline_messages, 50), - ejabberd_hooks:delete(remove_user, Host, ?MODULE, - remove_user, 50), - ejabberd_hooks:delete(anonymous_purge_hook, Host, - ?MODULE, remove_user, 50), - ejabberd_hooks:delete(disco_sm_features, Host, ?MODULE, get_sm_features, 50), - ejabberd_hooks:delete(disco_local_features, Host, ?MODULE, get_sm_features, 50), - ejabberd_hooks:delete(webadmin_page_host, Host, - ?MODULE, webadmin_page, 50), - ejabberd_hooks:delete(webadmin_user, Host, - ?MODULE, webadmin_user, 50), - ejabberd_hooks:delete(webadmin_user_parse_query, Host, - ?MODULE, webadmin_user_parse_query, 50), - Proc = gen_mod:get_module_proc(Host, ?PROCNAME), - exit(whereis(Proc), stop), - {wait, Proc}. - -get_sm_features(Acc, _From, _To, "", _Lang) -> +get_sm_features(Acc, _From, _To, <<"">>, _Lang) -> Feats = case Acc of {result, I} -> I; _ -> []