yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Username

This commit is contained in:
Feng Lee 2016-08-16 15:49:00 +08:00
parent 595c0f2d5a
commit 01cf8b8562
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqttd_protocol.erl
View File

@ -247,9 +247,9 @@ with_puback(Type, Packet = ?PUBLISH_PACKET(_Qos, PacketId),
end. end.
-spec(send(mqtt_message() | mqtt_packet(), proto_state()) -> {ok, proto_state()}). -spec(send(mqtt_message() | mqtt_packet(), proto_state()) -> {ok, proto_state()}).
send(Msg, State = #proto_state{client_id = ClientId}) send(Msg, State = #proto_state{client_id = ClientId, username = Username})
when is_record(Msg, mqtt_message) -> when is_record(Msg, mqtt_message) ->
emqttd:run_hooks('message.delivered', [ClientId], Msg), emqttd:run_hooks('message.delivered', [{ClientId, Username}], Msg),
send(emqttd_message:to_packet(Msg), State); send(emqttd_message:to_packet(Msg), State);
send(Packet, State = #proto_state{sendfun = SendFun}) send(Packet, State = #proto_state{sendfun = SendFun})

3
src/emqttd_session.erl
View File

@ -658,11 +658,12 @@ await(#mqtt_message{pktid = PktId}, Session = #session{awaiting_ack = Awaiting
Session#session{awaiting_ack = Awaiting1}. Session#session{awaiting_ack = Awaiting1}.
acked(PktId, Session = #session{client_id = ClientId, acked(PktId, Session = #session{client_id = ClientId,
username = Username,
inflight_queue = InflightQ, inflight_queue = InflightQ,
awaiting_ack = Awaiting}) -> awaiting_ack = Awaiting}) ->
case lists:keyfind(PktId, 1, InflightQ) of case lists:keyfind(PktId, 1, InflightQ) of
{_, Msg} -> {_, Msg} ->
emqttd:run_hooks('message.acked', [ClientId], Msg); emqttd:run_hooks('message.acked', [{ClientId, Username}], Msg);
false -> false ->
?LOG(error, "Cannot find acked pktid: ~p", [PktId], Session) ?LOG(error, "Cannot find acked pktid: ~p", [PktId], Session)
end, end,