24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-18 22:15:20 +02:00

Merge pull request #228 from weiss/turn-down-carbons-logging

Log just one [info] message on successful XEP-0280 negotiation
This commit is contained in:
Evgeny Khramtsov 2014-05-29 19:19:05 +04:00
commit 7261cb29ac

View File

@ -105,7 +105,7 @@ iq_handler1(From, To, IQ) ->
iq_handler(From, To, IQ, ?NS_CC_1). iq_handler(From, To, IQ, ?NS_CC_1).
iq_handler(From, _To, #iq{type=set, sub_el = #xmlel{name = Operation, children = []}} = IQ, CC)-> iq_handler(From, _To, #iq{type=set, sub_el = #xmlel{name = Operation, children = []}} = IQ, CC)->
?INFO_MSG("carbons IQ received: ~p", [IQ]), ?DEBUG("carbons IQ received: ~p", [IQ]),
{U, S, R} = jlib:jid_tolower(From), {U, S, R} = jlib:jid_tolower(From),
Result = case Operation of Result = case Operation of
<<"enable">>-> <<"enable">>->
@ -117,10 +117,10 @@ iq_handler(From, _To, #iq{type=set, sub_el = #xmlel{name = Operation, children
end, end,
case Result of case Result of
ok -> ok ->
?INFO_MSG("carbons IQ result: ok", []), ?DEBUG("carbons IQ result: ok", []),
IQ#iq{type=result, sub_el=[]}; IQ#iq{type=result, sub_el=[]};
{error,_Error} -> {error,_Error} ->
?INFO_MSG("Error enabling / disabling carbons: ~p", [Result]), ?WARNING_MSG("Error enabling / disabling carbons: ~p", [Result]),
IQ#iq{type=error,sub_el = [?ERR_BAD_REQUEST]} IQ#iq{type=error,sub_el = [?ERR_BAD_REQUEST]}
end; end;