.gitignore include/mod_muc.hrl @@ -106,6 +106,8 @@ logging = false, custom = [] }). + + %% @type user() = #user{ %% jid=jid(), %% nick=string(), include/mod_muc_room.hrl @@ -49,9 +49,8 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). +-include("mod_muc.hrl"). - --record(muc_room, {name_host, opts}). -record(muc_online_room, {name_host, pid}). -record(muc_registered, {us_host, nick}). @@ -520,8 +519,7 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper, load_permanent_rooms(Host, ServerHost, Access, HistorySize, RoomShaper, Storage) -> lists:foreach( - fun({Handler, R }) -> - {Room, Host} = R#muc_room.name_host, + fun(#muc_room{type=Handler, name_host={Room, _Host}, opts=Opts}) -> case mnesia:dirty_read(muc_online_room, {Room, Host}) of [] -> {ok, Pid} = mod_muc_room:start( @@ -531,7 +529,7 @@ load_permanent_rooms(Host, ServerHost, Access, HistorySize, RoomShaper, Storage) Room, HistorySize, RoomShaper, - R#muc_room.opts, + Opts, Handler, Storage), register_room(Host, Room, Pid); src/mod_muc.erl @@ -72,7 +72,7 @@ -include("jlib.hrl"). -include("mod_muc_room.hrl"). --define(DEFAULT_HANDLER, muc_room_default). +-define(DEFAULT_HANDLER, minimal_muc). -define(DBGFSM, true). @@ -168,8 +168,8 @@ init([Host, ServerHost, Access, Room, HistorySize, RoomShaper, Opts, Handler, St room_shaper = Shaper}, case handler_call(init, [Opts], State) of {result, ok, State1}-> - ?INFO_MSG("Fetched MUC room ~s@~s (Handler ~s)", - [Room, Host, Handler]), + ?INFO_MSG("Fetched MUC room ~s@~s (State ~s)", + [Room, Host, Opts]), {ok, normal_state, State1}; {error, Why, State1}-> ?ERROR_MSG("Handler ~p returned an error for ~p : ~p",[Handler, Room, Why]), @@ -2299,12 +2299,12 @@ handler_call(Function, Args, State, Handler) when is_record(State, state) -> Result -> {result, Result, State} end. maybe_persist(_Handler, O, O) -> ok; %No change -maybe_persist(Handler, O, N) -> +maybe_persist(Handler, O, #headers{storage=S}=N) -> case {catch Handler:is_persistent(O), catch Handler:is_persistent(N), O /= N} of {_, true, true} -> - mod_muc:store_room(N#headers.server_host, N#headers.host, N#headers.room, Handler, Handler:make_opts(N)); + S:store_room(N#headers.server_host, N#headers.host, N#headers.room, Handler, Handler:make_opts(N)); {true, false, _} -> - mod_muc:forget_room(N#headers.server_host, N#headers.host, N#headers.room); + S:forget_room(N#headers.server_host, N#headers.host, N#headers.room); {_, _, _} -> ok end. src/mod_muc_room.erl @@ -467,6 +467,7 @@ is_visitor(Jid, Headers) -> Opt -> Headers#headers{config = (Headers#headers.config)#config{Opt = Val}}). set_opts([], Headers) -> + ?DEBUG("Headers after applying opts : ~p", [Headers]), Headers; set_opts([{Opt, Val} | Opts], Headers) -> NH = case Opt of src/muc_room_default.erl @@ -5,10 +5,9 @@ -behaviour(gen_muc_storage). --record(muc_room, {name_host, type, opts}). -include("ejabberd.hrl"). -include("jlib.hrl"). --include("mod_muc_room.hrl"). +-include("mod_muc.hrl"). -export([init/3, store_room/5, restore_room/3, src/muc_storage_default.erl @@ -7,10 +7,10 @@ -behaviour(gen_muc_storage). --record(muc_room, {name_host, type, opts}). + -include("ejabberd.hrl"). -include("jlib.hrl"). --include("mod_muc_room.hrl"). +-include("mod_muc.hrl"). -export([init/3, store_room/5, restore_room/3, @@ -37,10 +37,15 @@ init(_Host, _ServerHost, Opts)-> % @doc Stores room. % Called on configuration change when MUC is persistent. store_room(Host,ServerHost, Name, Type, Opts)-> - ?DEBUG("store_room S3", []), - s3:write_object(get_bucket(), build_key(Host, Name), term_to_binary({Type, Opts}), "application/erlang"). + Bucket = get_bucket(), + Key = build_key(Host, Name), + Data = {Type, Opts}, + Res = s3:write_term(Bucket, Key, Data), + ?DEBUG("~p = s3:write_term(~p, ~p, ~p) ", [Res,Bucket, Key, Data]), + Res. + -% @spec (Host,ServerHost, Name)-> Config +% @spec (Host,ServerHost, Name)-> {Handler, Config} % @doc restores room from storage restore_room(Host,ServerHost, Name)-> ?DEBUG("restore_room S3", []), @@ -61,16 +66,17 @@ forget_room(Host, ServerHost, Name) -> % @doc Used for disco fetch_all_rooms(ServerHost, Host)-> ?DEBUG("fetch_all_rooms muc_s3", []), - case s3:get_objects(get_bucket(),[{prefix,"muc@"++Host}] ) of + case s3:get_objects(get_bucket(),[{prefix,build_key(Host,"")}] ) of {'EXIT', Reason} -> ?ERROR_MSG("~p", [Reason]), []; {error, timeout} -> ?ERROR_MSG("Timeout on S3", []), []; - {ok, Rs}-> - lists:map(fun({Key, Value})-> - #muc_room{name_host = split_key(Key), opts=binary_to_term(list_to_binary(Value))} + Rs-> + lists:map(fun({Key, Value, Headers})-> + {Type, Opts} = binary_to_term(list_to_binary(Value)), + #muc_room{name_host = split_key(Key), opts=Opts, type=Type} end, Rs) end. src/s3_muc_storage.erl ab448c1589d5814ab5a87f9e4e9e04f0d4899e70 Eric Cestari ecestari@mac.com http://github.com/cstar/modular_muc/commit/af74c96428c613acca002d240be86a46bed0c822 af74c96428c613acca002d240be86a46bed0c822 2009-05-07T01:32:04-07:00 2009-05-07T01:32:04-07:00 Corrected bugs - loading from storage fine - extracted #muc_room{} into mod_muc.hrl - corrected bugs in s3_muc_storage - added traces Know bugs : - All persistent data is erased on loading muc room and replaced by defaults. f4fbb589f1ebbbee2dce23abb076c7ae2c5814a7 Eric Cestari ecestari@mac.com