From 41fe062a8dfc346e4b35f61c9e649ee92a2f8351 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Sat, 15 Apr 2017 15:47:00 +0300 Subject: [PATCH] Lower log level for some messages --- src/ejabberd_router_redis.erl | 2 +- src/ejabberd_router_riak.erl | 2 +- src/ejabberd_router_sql.erl | 2 +- src/ejabberd_sm_redis.erl | 2 +- src/ejabberd_sm_riak.erl | 2 +- src/ejabberd_sm_sql.erl | 2 +- src/mod_bosh_redis.erl | 2 +- src/mod_bosh_riak.erl | 2 +- src/mod_bosh_sql.erl | 2 +- src/mod_carboncopy_redis.erl | 2 +- src/mod_carboncopy_riak.erl | 2 +- src/mod_carboncopy_sql.erl | 2 +- src/mod_muc_sql.erl | 4 ++-- src/mod_proxy65_redis.erl | 2 +- src/mod_proxy65_riak.erl | 2 +- src/mod_proxy65_sql.erl | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/ejabberd_router_redis.erl b/src/ejabberd_router_redis.erl index 03581a863..8fd48e855 100644 --- 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 d775e989e..d5955a9df 100644 --- 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 b354eb212..c0264da31 100644 --- 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 4314f8d27..cf1836c56 100644 --- 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 be6b49029..de1f9ada1 100644 --- 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 4e435c4e3..2b94064ef 100644 --- 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 194d220a1..3847befc0 100644 --- 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 5524a0ed8..4b91c1837 100644 --- 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 73e42868d..9c09a727b 100644 --- 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 b72755f4e..700d6beba 100644 --- 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 f8cb62019..63b2c2588 100644 --- 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 41d9a0632..3271d8a1c 100644 --- 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 a3b70a292..94d5706b8 100644 --- 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 84e95906a..199923d72 100644 --- 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 dd3cd64b5..8568b0ca2 100644 --- 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 e11c5e6ac..18f8db147 100644 --- 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 "