yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 09:49:18 +02:00
Code Issues Releases Wiki Activity

Avoid excessive logging of SQL failures

Browse source
This commit is contained in:
Evgeniy Khramtsov 2017-12-17 19:46:55 +03:00
parent 515f8b22c0
commit 5b42fc1d0d
13 changed files with 54 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/mod_muc_sql.erl
View file

@ -187,12 +187,10 @@ get_rooms(LServer, Host) ->
#muc_room{name_host = {Room, Host},
opts = mod_muc:opts_to_binary(OptsD2)}
end, RoomOpts);
Err ->
?ERROR_MSG("failed to get rooms subscribers: ~p", [Err]),
_Err ->
[]
end;
Err ->
?ERROR_MSG("failed to get rooms: ~p", [Err]),
_Err ->
[]
end.
@ -266,7 +264,6 @@ register_online_room(ServerHost, Room, Host, Pid) ->
ok ->
ok;
Err ->
?ERROR_MSG("failed to update 'muc_online_room': ~p", [Err]),
Err
end.
@ -290,8 +287,7 @@ find_online_room(ServerHost, Room, Host) ->
end;
{selected, []} ->
error;
Err ->
?ERROR_MSG("failed to select 'muc_online_room': ~p", [Err]),
_Err ->
error
end.
@ -302,8 +298,7 @@ count_online_rooms(ServerHost, Host) ->
"where host=%(Host)s")) of
{selected, [{Num}]} ->
Num;
Err ->
?ERROR_MSG("failed to select 'muc_online_room': ~p", [Err]),
_Err ->
0
end.
@ -319,8 +314,7 @@ get_online_rooms(ServerHost, Host, _RSM) ->
catch _:{bad_node, _} -> []
end
end, Rows);
Err ->
?ERROR_MSG("failed to select 'muc_online_room': ~p", [Err]),
_Err ->
[]
end.
@ -340,7 +334,6 @@ register_online_user(ServerHost, {U, S, R}, Room, Host) ->
ok ->
ok;
Err ->
?ERROR_MSG("failed to update 'muc_online_users': ~p", [Err]),
Err
end.
@ -359,8 +352,7 @@ count_online_rooms_by_user(ServerHost, U, S) ->
"username=%(U)s and server=%(S)s")) of
{selected, [{Num}]} ->
Num;
Err ->
?ERROR_MSG("failed to select 'muc_online_users': ~p", [Err]),
_Err ->
0
end.
@ -371,8 +363,7 @@ get_online_rooms_by_user(ServerHost, U, S) ->
"username=%(U)s and server=%(S)s")) of
{selected, Rows} ->
Rows;
Err ->
?ERROR_MSG("failed to select 'muc_online_users': ~p", [Err]),
_Err ->
[]
end.
@ -424,8 +415,7 @@ get_subscribed_rooms(LServer, Host, Jid) ->
" and host=%(Host)s")) of
{selected, Subs} ->
[jid:make(Room, Host, <<>>) || {Room} <- Subs];
Error ->
?ERROR_MSG("Error when fetching subscribed rooms ~p", [Error]),
_Error ->
[]
end.