Lower log level for some messages

diff --git a/src/ejabberd_router_redis.erl b/src/ejabberd_router_redis.erl
index 03581a863358d15314b359864218551017b8d49c..8fd48e8556018f4ce9542bca30476d0222723893 100644 (file)
--- a/src/ejabberd_router_redis.erl
+++ b/src/ejabberd_router_redis.erl
@@ -153,7 +153,7 @@ code_change(_OldVsn, State, _Extra) ->
 %%% Internal functions
 %%%===================================================================
 clean_table() ->
-    ?INFO_MSG("Cleaning Redis route entries...", []),
+    ?DEBUG("Cleaning Redis route entries...", []),
     lists:foreach(
       fun(#route{domain = Domain, pid = Pid}) when node(Pid) == node() ->
              unregister_route(Domain, undefined, Pid);

diff --git a/src/ejabberd_router_riak.erl b/src/ejabberd_router_riak.erl
index d775e989e4349a6d1638f541697e49f8e92aaab8..d5955a9dfa15d02de7fefdd01ae8cdcc565cb971 100644 (file)
--- a/src/ejabberd_router_riak.erl
+++ b/src/ejabberd_router_riak.erl
@@ -70,7 +70,7 @@ route_schema() ->
     {record_info(fields, route), #route{}}.
 
 clean_table() ->
-    ?INFO_MSG("Cleaning Riak 'route' table...", []),
+    ?DEBUG("Cleaning Riak 'route' table...", []),
     case ejabberd_riak:get(route, route_schema()) of
        {ok, Routes} ->
            lists:foreach(

diff --git a/src/ejabberd_router_sql.erl b/src/ejabberd_router_sql.erl
index b354eb212cb48ea19eaf113dfe2a610a55cfe29c..c0264da310a00be53f49510e34cfbc24e8ffa61b 100644 (file)
--- a/src/ejabberd_router_sql.erl
+++ b/src/ejabberd_router_sql.erl
@@ -39,7 +39,7 @@
 %%%===================================================================
 init() ->
     Node = erlang:atom_to_binary(node(), latin1),
-    ?INFO_MSG("Cleaning SQL 'route' table...", []),
+    ?DEBUG("Cleaning SQL 'route' table...", []),
     case ejabberd_sql:sql_query(
           ?MYNAME, ?SQL("delete from route where node=%(Node)s")) of
        {updated, _} ->

diff --git a/src/ejabberd_sm_redis.erl b/src/ejabberd_sm_redis.erl
index 4314f8d278ee872976593e02a88bdae21a44d06c..cf1836c5655fc012b70306142cfe0e0e478e82cf 100644 (file)
--- a/src/ejabberd_sm_redis.erl
+++ b/src/ejabberd_sm_redis.erl
@@ -188,7 +188,7 @@ decode_session_list(Vals) ->
   [binary_to_term(Val) || {_, Val} <- Vals].
 
 clean_table() ->
-    ?INFO_MSG("Cleaning Redis SM table...", []),
+    ?DEBUG("Cleaning Redis SM table...", []),
     try
        lists:foreach(
          fun(LServer) ->

diff --git a/src/ejabberd_sm_riak.erl b/src/ejabberd_sm_riak.erl
index be6b49029dfa32808770370e9267aa142c0be899..de1f9ada1e7427f13ec6f27903236cb49533420f 100644 (file)
--- a/src/ejabberd_sm_riak.erl
+++ b/src/ejabberd_sm_riak.erl
@@ -63,7 +63,7 @@ session_schema() ->
 
 clean_table() ->
     %% TODO: not very efficient, rewrite using map-reduce or something
-    ?INFO_MSG("Cleaning Riak 'sm' table...", []),
+    ?DEBUG("Cleaning Riak 'sm' table...", []),
     lists:foreach(
       fun(#session{sid = {_, Pid} = SID}) when node(Pid) == node() ->
              ejabberd_riak:delete(session, SID);

diff --git a/src/ejabberd_sm_sql.erl b/src/ejabberd_sm_sql.erl
index 4e435c4e318de9c98e5a2e7d3ef5fc8524493336..2b94064ef20413a54d7f054c37845ac06daedff7 100644 (file)
--- a/src/ejabberd_sm_sql.erl
+++ b/src/ejabberd_sm_sql.erl
@@ -47,7 +47,7 @@
 -spec init() -> ok | {error, any()}.
 init() ->
     Node = erlang:atom_to_binary(node(), latin1),
-    ?INFO_MSG("Cleaning SQL SM table...", []),
+    ?DEBUG("Cleaning SQL SM table...", []),
     lists:foldl(
       fun(Host, ok) ->
              case ejabberd_sql:sql_query(

diff --git a/src/mod_bosh_redis.erl b/src/mod_bosh_redis.erl
index 194d220a1d6e610a79de149fed5e7481f849fc8a..3847befc08030b4fffdf2040b2605424eb37e8d1 100644 (file)
--- a/src/mod_bosh_redis.erl
+++ b/src/mod_bosh_redis.erl
@@ -115,7 +115,7 @@ code_change(_OldVsn, State, _Extra) ->
 %%% Internal functions
 %%%===================================================================
 clean_table() ->
-    ?INFO_MSG("Cleaning Redis BOSH sessions...", []),
+    ?DEBUG("Cleaning Redis BOSH sessions...", []),
     case ejabberd_redis:hgetall(?BOSH_KEY) of
        {ok, Vals} ->
            ejabberd_redis:multi(

diff --git a/src/mod_bosh_riak.erl b/src/mod_bosh_riak.erl
index 5524a0ed8dbd5eecc6aaa05821818afd035c508a..4b91c183756976c6c71c905a4cde6761083368a4 100644 (file)
--- a/src/mod_bosh_riak.erl
+++ b/src/mod_bosh_riak.erl
@@ -56,7 +56,7 @@ bosh_schema() ->
     {record_info(fields, bosh), #bosh{}}.
 
 clean_table() ->
-    ?INFO_MSG("Cleaning Riak 'bosh' table...", []),
+    ?DEBUG("Cleaning Riak 'bosh' table...", []),
     case ejabberd_riak:get(bosh, bosh_schema()) of
        {ok, Rs} ->
            lists:foreach(

diff --git a/src/mod_bosh_sql.erl b/src/mod_bosh_sql.erl
index 73e42868d86db35ac4a9999a95fa5b1b2032f69f..9c09a727b50d502febd21b6f87cccbef6067b7df 100644 (file)
--- a/src/mod_bosh_sql.erl
+++ b/src/mod_bosh_sql.erl
@@ -23,7 +23,7 @@
 %%%===================================================================
 init() ->
     Node = erlang:atom_to_binary(node(), latin1),
-    ?INFO_MSG("Cleaning SQL 'bosh' table...", []),
+    ?DEBUG("Cleaning SQL 'bosh' table...", []),
     case ejabberd_sql:sql_query(
           ?MYNAME, ?SQL("delete from bosh where node=%(Node)s")) of
        {updated, _} ->

diff --git a/src/mod_carboncopy_redis.erl b/src/mod_carboncopy_redis.erl
index b72755f4ea8cc6cf8e7274248ba94405066d6030..700d6bebab12593277d458fbd1a365864e8a0bc0 100644 (file)
--- a/src/mod_carboncopy_redis.erl
+++ b/src/mod_carboncopy_redis.erl
@@ -150,7 +150,7 @@ code_change(_OldVsn, State, _Extra) ->
 %%% Internal functions
 %%%===================================================================
 clean_table() ->
-    ?INFO_MSG("Cleaning Redis 'carboncopy' table...", []),
+    ?DEBUG("Cleaning Redis 'carboncopy' table...", []),
     NodeKey = node_key(),
     case ejabberd_redis:smembers(NodeKey) of
        {ok, JIDs} ->

diff --git a/src/mod_carboncopy_riak.erl b/src/mod_carboncopy_riak.erl
index f8cb620192e3c47a84961ac2eddc017a1418f97c..63b2c2588c1a51d9ebc60f519af3cf84b08aa48d 100644 (file)
--- a/src/mod_carboncopy_riak.erl
+++ b/src/mod_carboncopy_riak.erl
@@ -66,7 +66,7 @@ carboncopy_schema() ->
     {record_info(fields, carboncopy), #carboncopy{}}.
 
 clean_table() ->
-    ?INFO_MSG("Cleaning Riak 'carboncopy' table...", []),
+    ?DEBUG("Cleaning Riak 'carboncopy' table...", []),
     case ejabberd_riak:get(carboncopy, carboncopy_schema()) of
        {ok, Rs} ->
            lists:foreach(

diff --git a/src/mod_carboncopy_sql.erl b/src/mod_carboncopy_sql.erl
index 41d9a0632f41db04ad8f5718adf6d49f49b0971d..3271d8a1cff69c3787a11580f83d107372d2c106 100644 (file)
--- a/src/mod_carboncopy_sql.erl
+++ b/src/mod_carboncopy_sql.erl
@@ -82,7 +82,7 @@ list(LUser, LServer) ->
 %%%===================================================================
 clean_table(LServer) ->
     NodeS = erlang:atom_to_binary(node(), latin1),
-    ?INFO_MSG("Cleaning SQL 'carboncopy' table...", []),
+    ?DEBUG("Cleaning SQL 'carboncopy' table...", []),
     case ejabberd_sql:sql_query(
           LServer,
           ?SQL("delete from carboncopy where node=%(NodeS)s")) of

diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
index a3b70a292b1d19e14e9e2781e54d66b15479c904..94d5706b8d9632f71e41b70bb844c215018c685d 100644 (file)
--- a/src/mod_muc_sql.erl
+++ b/src/mod_muc_sql.erl
@@ -330,7 +330,7 @@ import(_, _, _) ->
 %%%===================================================================
 clean_tables(ServerHost) ->
     NodeS = erlang:atom_to_binary(node(), latin1),
-    ?INFO_MSG("Cleaning SQL muc_online_room table...", []),
+    ?DEBUG("Cleaning SQL muc_online_room table...", []),
     case ejabberd_sql:sql_query(
           ServerHost,
           ?SQL("delete from muc_online_room where node=%(NodeS)s")) of
@@ -340,7 +340,7 @@ clean_tables(ServerHost) ->
            ?ERROR_MSG("failed to clean 'muc_online_room' table: ~p", [Err1]),
            Err1
     end,
-    ?INFO_MSG("Cleaning SQL muc_online_users table...", []),
+    ?DEBUG("Cleaning SQL muc_online_users table...", []),
     case ejabberd_sql:sql_query(
           ServerHost,
           ?SQL("delete from muc_online_users where node=%(NodeS)s")) of

diff --git a/src/mod_proxy65_redis.erl b/src/mod_proxy65_redis.erl
index 84e95906a076d9091b28c0a8d9ae6a98da93fae8..199923d72de1c9d14f6f4060816cb11e3a54eff7 100644 (file)
--- a/src/mod_proxy65_redis.erl
+++ b/src/mod_proxy65_redis.erl
@@ -37,7 +37,7 @@
 %%% API
 %%%===================================================================
 init() ->
-    ?INFO_MSG("Cleaning Redis 'proxy65' table...", []),
+    ?DEBUG("Cleaning Redis 'proxy65' table...", []),
     NodeKey = node_key(),
     case ejabberd_redis:smembers(NodeKey) of
        {ok, SIDs} ->

diff --git a/src/mod_proxy65_riak.erl b/src/mod_proxy65_riak.erl
index dd3cd64b5fa6bd45729f0a96a8a34c715f995791..8568b0ca20794de527cb85c972f51ce66410a561 100644 (file)
--- a/src/mod_proxy65_riak.erl
+++ b/src/mod_proxy65_riak.erl
@@ -93,7 +93,7 @@ proxy65_schema() ->
     {record_info(fields, proxy65), #proxy65{}}.
 
 clean_table() ->
-    ?INFO_MSG("Cleaning Riak 'proxy65' table...", []),
+    ?DEBUG("Cleaning Riak 'proxy65' table...", []),
     case ejabberd_riak:get(proxy65, proxy65_schema()) of
        {ok, Rs} ->
            lists:foreach(

diff --git a/src/mod_proxy65_sql.erl b/src/mod_proxy65_sql.erl
index e11c5e6ac6636ea2b52d7d3d0719e7e62305c84c..18f8db147c2f1a5aba295004aa92fde961b14c12 100644 (file)
--- a/src/mod_proxy65_sql.erl
+++ b/src/mod_proxy65_sql.erl
@@ -37,7 +37,7 @@
 %%%===================================================================
 init() ->
     NodeS = erlang:atom_to_binary(node(), latin1),
-    ?INFO_MSG("Cleaning SQL 'proxy65' table...", []),
+    ?DEBUG("Cleaning SQL 'proxy65' table...", []),
     case ejabberd_sql:sql_query(
           ?MYNAME,
           ?SQL("delete from proxy65 where "