Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

Reduce verbosity of HTTP Binding log messages (thanks to Alexey Shchepin)

Browse Source
This commit is contained in:
Badlop 2010-02-19 00:08:04 +01:00
parent ceb377621e
commit ca1ac76108
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/web/ejabberd_http_bind.erl
View File

@ -173,7 +173,7 @@ process_request(Data, IP) ->
{ok, {"", Rid, Attrs, Payload}} -> {ok, {"", Rid, Attrs, Payload}} ->
case xml:get_attr_s("to",Attrs) of case xml:get_attr_s("to",Attrs) of
"" -> "" ->
?ERROR_MSG("Session not created (Improper addressing)", []), ?DEBUG("Session not created (Improper addressing)", []),
{200, ?HEADER, "<body type='terminate' " {200, ?HEADER, "<body type='terminate' "
"condition='improper-addressing' " "condition='improper-addressing' "
"xmlns='" ++ ?NS_HTTP_BIND_s ++ "'/>"}; "xmlns='" ++ ?NS_HTTP_BIND_s ++ "'/>"};
@ -379,7 +379,7 @@ handle_sync_event({stop,stream_closed}, _From, _StateName, StateData) ->
Reply = ok, Reply = ok,
{stop, normal, Reply, StateData}; {stop, normal, Reply, StateData};
handle_sync_event({stop,Reason}, _From, _StateName, StateData) -> handle_sync_event({stop,Reason}, _From, _StateName, StateData) ->
?ERROR_MSG("Closing bind session ~p - Reason: ~p", [StateData#state.id, Reason]), ?DEBUG("Closing bind session ~p - Reason: ~p", [StateData#state.id, Reason]),
Reply = ok, Reply = ok,
{stop, normal, Reply, StateData}; {stop, normal, Reply, StateData};
@ -755,10 +755,10 @@ process_buffered_request(Reply, StateName, StateData) ->
handle_http_put(Sid, Rid, Attrs, Payload, PayloadSize, StreamStart, IP) -> handle_http_put(Sid, Rid, Attrs, Payload, PayloadSize, StreamStart, IP) ->
case http_put(Sid, Rid, Attrs, Payload, PayloadSize, StreamStart, IP) of case http_put(Sid, Rid, Attrs, Payload, PayloadSize, StreamStart, IP) of
{error, not_exists} -> {error, not_exists} ->
?ERROR_MSG("no session associated with sid: ~p", [Sid]), ?DEBUG("no session associated with sid: ~p", [Sid]),
{404, ?HEADER, ""}; {404, ?HEADER, ""};
{{error, Reason}, Sess} -> {{error, Reason}, Sess} ->
?ERROR_MSG("Error on HTTP put. Reason: ~p", [Reason]), ?DEBUG("Error on HTTP put. Reason: ~p", [Reason]),
handle_http_put_error(Reason, Sess); handle_http_put_error(Reason, Sess);
{{repeat, OutPacket}, Sess} -> {{repeat, OutPacket}, Sess} ->
?DEBUG("http_put said 'repeat!' ...~nOutPacket: ~p", [OutPacket]), ?DEBUG("http_put said 'repeat!' ...~nOutPacket: ~p", [OutPacket]),
@ -855,13 +855,13 @@ handle_http_put_error(Reason, #http_bind{pid=FsmRef}) ->
gen_fsm:sync_send_all_state_event(FsmRef,{stop, {put_error_no_version, Reason}}), gen_fsm:sync_send_all_state_event(FsmRef,{stop, {put_error_no_version, Reason}}),
case Reason of case Reason of
not_exists -> %% bad rid not_exists -> %% bad rid
?ERROR_MSG("Closing HTTP bind session (Bad rid).", []), ?DEBUG("Closing HTTP bind session (Bad rid).", []),
{404, ?HEADER, ""}; {404, ?HEADER, ""};
bad_key -> bad_key ->
?ERROR_MSG("Closing HTTP bind session (Bad key).", []), ?DEBUG("Closing HTTP bind session (Bad key).", []),
{404, ?HEADER, ""}; {404, ?HEADER, ""};
polling_too_frequently -> polling_too_frequently ->
?ERROR_MSG("Closing HTTP bind session (User polling too frequently).", []), ?DEBUG("Closing HTTP bind session (User polling too frequently).", []),
{403, ?HEADER, ""} {403, ?HEADER, ""}
end. end.
@ -923,7 +923,14 @@ prepare_response(#http_bind{id=Sid, wait=Wait, hold=Hold, to=To}=Sess,
?DEBUG("OutPacket: ~p", [OutPacket]), ?DEBUG("OutPacket: ~p", [OutPacket]),
case StreamStart of case StreamStart of
false -> false ->
send_outpacket(Sess, OutPacket); case catch send_outpacket(Sess, OutPacket) of
{'EXIT', _Reason} ->
{200, ?HEADER,
"<body type='terminate' xmlns='"++
?NS_HTTP_BIND_s++"'/>"};
SendRes ->
SendRes
end;
true -> true ->
case OutPacket of case OutPacket of
[{xmlstreamstart, _, OutAttrs} | Els] -> [{xmlstreamstart, _, OutAttrs} | Els] ->