aboutsummaryrefslogtreecommitdiff
path: root/src/mod_service_log.erl
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-01-20 19:35:46 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-01-20 19:35:46 +0300
commitd5d906184f41232e8ab0b4de1308bfa49a783a61 (patch)
treeb589bba220001a7cf356a7e8fbf4ccb59480508c /src/mod_service_log.erl
parentPrepare 17.01 for hex.pm (diff)
parentFix reporting dialback failures (diff)
Merge branch 'new_stream'
Conflicts: src/cyrsasl.erl src/ejabberd_c2s.erl src/ejabberd_cluster.erl src/ejabberd_frontend_socket.erl src/ejabberd_node_groups.erl src/ejabberd_router.erl src/mod_bosh.erl src/mod_ip_blacklist.erl src/mod_muc_mnesia.erl src/mod_offline.erl src/mod_proxy65_sm.erl
Diffstat (limited to 'src/mod_service_log.erl')
-rw-r--r--src/mod_service_log.erl20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl
index 1d64f1471..d29cd1329 100644
--- a/src/mod_service_log.erl
+++ b/src/mod_service_log.erl
@@ -29,8 +29,8 @@
-behaviour(gen_mod).
--export([start/2, stop/1, log_user_send/4,
- log_user_receive/5, mod_opt_type/1, depends/2]).
+-export([start/2, stop/1, log_user_send/1,
+ log_user_receive/1, mod_opt_type/1, depends/2]).
-include("ejabberd.hrl").
-include("logger.hrl").
@@ -54,15 +54,19 @@ stop(Host) ->
depends(_Host, _Opts) ->
[].
--spec log_user_send(stanza(), ejabberd_c2s:state(), jid(), jid()) -> stanza().
-log_user_send(Packet, _C2SState, From, To) ->
+-spec log_user_send({stanza(), ejabberd_c2s:state()}) -> {stanza(), ejabberd_c2s:state()}.
+log_user_send({Packet, C2SState}) ->
+ From = xmpp:get_from(Packet),
+ To = xmpp:get_to(Packet),
log_packet(From, To, Packet, From#jid.lserver),
- Packet.
+ {Packet, C2SState}.
--spec log_user_receive(stanza(), ejabberd_c2s:state(), jid(), jid(), jid()) -> stanza().
-log_user_receive(Packet, _C2SState, _JID, From, To) ->
+-spec log_user_receive({stanza(), ejabberd_c2s:state()}) -> {stanza(), ejabberd_c2s:state()}.
+log_user_receive({Packet, C2SState}) ->
+ From = xmpp:get_from(Packet),
+ To = xmpp:get_to(Packet),
log_packet(From, To, Packet, To#jid.lserver),
- Packet.
+ {Packet, C2SState}.
-spec log_packet(jid(), jid(), stanza(), binary()) -> ok.
log_packet(From, To, Packet, Host) ->