This commit is contained in:
JianBo He 2019-12-07 20:46:11 +08:00 committed by Feng Lee
parent 0f9f1258b6
commit 08e234f61e
2 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
%%-*- mode: erlang -*- %%-*- mode: erlang -*-
%% .app.src.script %% .app.src.script
Config = case os:getenv("EMQX_DESC") of Config = case os:getenv("EMQX_DESC") of
false -> CONFIG; % env var not defined false -> CONFIG; % env var not defined
[] -> CONFIG; % env var set to empty string [] -> CONFIG; % env var set to empty string
@ -31,4 +31,4 @@ case os:getenv("EMQX_DEPS_DEFAULT_VSN") of
AppConf0 = lists:keystore(vsn, 1, AppConf, {vsn, RemoveLeadingV(Tag)}), AppConf0 = lists:keystore(vsn, 1, AppConf, {vsn, RemoveLeadingV(Tag)}),
{application, App, AppConf0} {application, App, AppConf0}
end || Conf = {application, App, AppConf} <- Config] end || Conf = {application, App, AppConf} <- Config]
end. end.

View File

@ -375,7 +375,7 @@ process_publish(Packet = ?PUBLISH_PACKET(_QoS, Topic, PacketId), Channel) ->
fun check_pub_caps/2 fun check_pub_caps/2
], Packet, Channel) of ], Packet, Channel) of
{ok, NPacket, NChannel} -> {ok, NPacket, NChannel} ->
Msg = pub_to_msg(NPacket, NChannel), Msg = packet_to_msg(NPacket, NChannel),
do_publish(PacketId, Msg, NChannel); do_publish(PacketId, Msg, NChannel);
{error, ReasonCode, NChannel} -> {error, ReasonCode, NChannel} ->
?LOG(warning, "Cannot publish message to ~s due to ~s", ?LOG(warning, "Cannot publish message to ~s due to ~s",
@ -383,9 +383,9 @@ process_publish(Packet = ?PUBLISH_PACKET(_QoS, Topic, PacketId), Channel) ->
handle_out(disconnect, ReasonCode, NChannel) handle_out(disconnect, ReasonCode, NChannel)
end. end.
pub_to_msg(Packet, #channel{conninfo = #{proto_ver := ProtoVer}, packet_to_msg(Packet, #channel{conninfo = #{proto_ver := ProtoVer},
clientinfo = ClientInfo = clientinfo = ClientInfo =
#{mountpoint := MountPoint}}) -> #{mountpoint := MountPoint}}) ->
emqx_mountpoint:mount( emqx_mountpoint:mount(
MountPoint, emqx_packet:to_message( MountPoint, emqx_packet:to_message(
ClientInfo, #{proto_ver => ProtoVer}, Packet)). ClientInfo, #{proto_ver => ProtoVer}, Packet)).