jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update mod_statsdx to work with ejabberd 16.02

This commit is contained in:
Holger Weiss 2016-03-08 00:31:41 +01:00
parent b7414f8837
commit 4165428780
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mod_statsdx/src/mod_statsdx.erl
View File

@ -801,8 +801,8 @@ received_response(From, {xmlel, <<"iq">>, Attrs, Elc}) ->
Host = From#jid.lserver, Host = From#jid.lserver,
Resource = From#jid.lresource, Resource = From#jid.lresource,
<<"result">> = xml:get_attr_s(<<"type">>, Attrs), <<"result">> = fxml:get_attr_s(<<"type">>, Attrs),
Lang = case xml:get_attr_s(<<"xml:lang">>, Attrs) of Lang = case fxml:get_attr_s(<<"xml:lang">>, Attrs) of
<<"">> -> "unknown"; <<"">> -> "unknown";
L -> binary_to_list(L) L -> binary_to_list(L)
end, end,
@ -811,9 +811,9 @@ received_response(From, {xmlel, <<"iq">>, Attrs, Elc}) ->
update_counter_create(TableHost, {lang, Host, Lang}, 1), update_counter_create(TableHost, {lang, Host, Lang}, 1),
update_counter_create(TableServer, {lang, server, Lang}, 1), update_counter_create(TableServer, {lang, server, Lang}, 1),
[El] = xml:remove_cdata(Elc), [El] = fxml:remove_cdata(Elc),
{xmlel, _, Attrs2, _Els2} = El, {xmlel, _, Attrs2, _Els2} = El,
?NS_VERSION = xml:get_attr_s(<<"xmlns">>, Attrs2), ?NS_VERSION = fxml:get_attr_s(<<"xmlns">>, Attrs2),
Client = get_tag_cdata_subtag(El, <<"name">>), Client = get_tag_cdata_subtag(El, <<"name">>),
Version = get_tag_cdata_subtag(El, <<"version">>), Version = get_tag_cdata_subtag(El, <<"version">>),
@ -849,10 +849,10 @@ update_counter_create(Table, Element, C) ->
end. end.
get_tag_cdata_subtag(E, T) -> get_tag_cdata_subtag(E, T) ->
E2 = xml:get_subtag(E, T), E2 = fxml:get_subtag(E, T),
case E2 of case E2 of
false -> "unknown"; false -> "unknown";
_ -> binary_to_list(xml:get_tag_cdata(E2)) _ -> binary_to_list(fxml:get_tag_cdata(E2))
end. end.
list_elem(Type, id) -> list_elem(Type, id) ->
@ -1712,7 +1712,7 @@ get_users_vcard_fun(#vcard{us = {_, Host1}}, {HostReq, NumRemaining, MinSize, Si
when (Host1 /= HostReq) and (HostReq /= server) -> when (Host1 /= HostReq) and (HostReq /= server) ->
{HostReq, NumRemaining, MinSize, Sizes, Selects}; {HostReq, NumRemaining, MinSize, Sizes, Selects};
get_users_vcard_fun(Vcard, {HostReq, NumRemaining, MinSize, Sizes, Selects}) -> get_users_vcard_fun(Vcard, {HostReq, NumRemaining, MinSize, Sizes, Selects}) ->
Binary = xml:element_to_binary(Vcard#vcard.vcard), Binary = fxml:element_to_binary(Vcard#vcard.vcard),
Size = byte_size(Binary), Size = byte_size(Binary),
case {Size > MinSize, NumRemaining > 0} of case {Size > MinSize, NumRemaining > 0} of
{true, true} -> {true, true} ->