Clean mod_carboncopy.erl from DB specific code

diff --git a/include/mod_carboncopy.hrl b/include/mod_carboncopy.hrl
new file mode 100644 (file)
index 0000000..df69938
--- /dev/null
+++ b/include/mod_carboncopy.hrl
@@ -0,0 +1,4 @@
+-type matchspec_atom() :: '_' | '$1' | '$2' | '$3'.
+-record(carboncopy, {us       :: {binary(), binary()} | matchspec_atom(), 
+                    resource :: binary() | matchspec_atom(),
+                    version  :: binary() | matchspec_atom()}).

diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl
index 1e0499eecfae8da354c0b2cea735b39e8560d4f7..ebf1d0b0fc2d8c8f7cfa69838fadf54af49fce04 100644 (file)
--- a/src/mod_carboncopy.erl
+++ b/src/mod_carboncopy.erl
@@ -43,12 +43,11 @@
 -include("logger.hrl").
 -include("jlib.hrl").
 -define(PROCNAME, ?MODULE).
--define(TABLE, carboncopy).
 
--type matchspec_atom() :: '_' | '$1' | '$2' | '$3'.
--record(carboncopy,{us :: {binary(), binary()} | matchspec_atom(), 
-                   resource :: binary() | matchspec_atom(),
-                   version :: binary() | matchspec_atom()}).
+-callback init(binary(), gen_mod:opts()) -> any().
+-callback enable(binary(), binary(), binary(), binary()) -> ok | {error, any()}.
+-callback disable(binary(), binary(), binary()) -> ok | {error, any()}.
+-callback list(binary(), binary()) -> [{binary(), binary()}].
 
 is_carbon_copy(Packet) ->
     is_carbon_copy(Packet, <<"sent">>) orelse
@@ -69,17 +68,8 @@ start(Host, Opts) ->
     IQDisc = gen_mod:get_opt(iqdisc, Opts,fun gen_iq_handler:check_type/1, one_queue),
     mod_disco:register_feature(Host, ?NS_CARBONS_1),
     mod_disco:register_feature(Host, ?NS_CARBONS_2),
-    Fields = record_info(fields, ?TABLE),
-    try mnesia:table_info(?TABLE, attributes) of
-       Fields -> ok;
-       _ -> mnesia:delete_table(?TABLE)  %% recreate..
-    catch _:_Error -> ok  %%probably table don't exist
-    end,
-    mnesia:create_table(?TABLE,
-       [{ram_copies, [node()]}, 
-        {attributes, record_info(fields, ?TABLE)}, 
-        {type, bag}]),
-    mnesia:add_table_copy(?TABLE, node(), ram_copies),
+    Mod = gen_mod:db_mod(Host, ?MODULE),
+    Mod:init(Host, Opts),
     ejabberd_hooks:add(unset_presence_hook,Host, ?MODULE, remove_connection, 10),
     %% why priority 89: to define clearly that we must run BEFORE mod_logdb hook (90)
     ejabberd_hooks:add(user_send_packet,Host, ?MODULE, user_send_packet, 89),
@@ -244,18 +234,13 @@ build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CARBONS_1) ->
 
 enable(Host, U, R, CC)->
     ?DEBUG("enabling for ~p", [U]),
-     try mnesia:dirty_write(#carboncopy{us = {U, Host}, resource=R, version = CC}) of
-       ok -> ok
-     catch _:Error -> {error, Error}
-     end.      
+    Mod = gen_mod:db_mod(Host, ?MODULE),
+    Mod:enable(U, Host, R, CC).
 
 disable(Host, U, R)->
     ?DEBUG("disabling for ~p", [U]),
-    ToDelete = mnesia:dirty_match_object(?TABLE, #carboncopy{us = {U, Host}, resource = R, version = '_'}),
-    try lists:foreach(fun mnesia:dirty_delete_object/1, ToDelete) of
-       ok -> ok
-    catch _:Error -> {error, Error}
-    end.
+    Mod = gen_mod:db_mod(Host, ?MODULE),
+    Mod:disable(U, Host, R).
 
 complete_packet(From, #xmlel{name = <<"message">>, attrs = OrigAttrs} = Packet, sent) ->
     %% if this is a packet sent by user on this host, then Packet doesn't
@@ -290,8 +275,12 @@ has_non_empty_body(Packet) ->
 
 %% list {resource, cc_version} with carbons enabled for given user and host
 list(User, Server) ->
-       mnesia:dirty_select(?TABLE, [{#carboncopy{us = {User, Server}, resource = '$2', version = '$3'}, [], [{{'$2','$3'}}]}]).
-
+    Mod = gen_mod:db_mod(Server, ?MODULE),
+    Mod:list(User, Server).
 
 mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1;
-mod_opt_type(_) -> [iqdisc].
+mod_opt_type(db_type) ->
+    fun(internal) -> mnesia;
+       (mnesia) -> mnesia
+    end;
+mod_opt_type(_) -> [db_type, iqdisc].

diff --git a/src/mod_carboncopy_mnesia.erl b/src/mod_carboncopy_mnesia.erl
new file mode 100644 (file)
index 0000000..bf69bd2
--- /dev/null
+++ b/src/mod_carboncopy_mnesia.erl
@@ -0,0 +1,68 @@
+%%%-------------------------------------------------------------------
+%%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%% @copyright (C) 2016, Evgeny Khramtsov
+%%% @doc
+%%%
+%%% @end
+%%% Created : 15 Apr 2016 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%-------------------------------------------------------------------
+-module(mod_carboncopy_mnesia).
+
+-behaviour(mod_carboncopy).
+
+%% API
+-export([init/2, enable/4, disable/3, list/2]).
+
+-include("mod_carboncopy.hrl").
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+init(_Host, _Opts) ->
+    Fields = record_info(fields, carboncopy),
+    try mnesia:table_info(carboncopy, attributes) of
+       Fields ->
+           ok;
+       _ ->
+           %% recreate..
+           mnesia:delete_table(carboncopy)
+    catch _:_Error ->
+           %% probably table don't exist
+           ok
+    end,
+    mnesia:create_table(carboncopy,
+                       [{ram_copies, [node()]}, 
+                        {attributes, record_info(fields, carboncopy)}, 
+                        {type, bag}]),
+    mnesia:add_table_copy(carboncopy, node(), ram_copies).
+
+enable(LUser, LServer, LResource, NS) ->
+    try mnesia:dirty_write(
+         #carboncopy{us = {LUser, LServer},
+                     resource = LResource,
+                     version = NS}) of
+       ok -> ok
+    catch _:Error ->
+           {error, Error}
+    end.
+
+disable(LUser, LServer, LResource) ->
+    ToDelete = mnesia:dirty_match_object(
+                #carboncopy{us = {LUser, LServer},
+                            resource = LResource,
+                            version = '_'}),
+    try lists:foreach(fun mnesia:dirty_delete_object/1, ToDelete) of
+       ok -> ok
+    catch _:Error ->
+           {error, Error}
+    end.
+
+list(LUser, LServer) ->
+    mnesia:dirty_select(
+      carboncopy,
+      [{#carboncopy{us = {LUser, LServer}, resource = '$2', version = '$3'},
+       [], [{{'$2','$3'}}]}]).
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================