From dace8826678138f201a10323ce5cb0bf8b5b5983 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Sat, 7 Dec 2019 17:06:22 +0800
Subject: [PATCH] Fix will message

---
 src/emqx_channel.erl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/emqx_channel.erl b/src/emqx_channel.erl
index f2e875a26..2e39d1742 100644
--- a/src/emqx_channel.erl
+++ b/src/emqx_channel.erl
@@ -882,7 +882,11 @@ terminate(normal, #channel{conninfo = ConnInfo, clientinfo = ClientInfo}) ->
 terminate({shutdown, Reason}, #channel{conninfo = ConnInfo, clientinfo = ClientInfo})
     when Reason =:= kicked orelse Reason =:= discarded orelse Reason =:= takeovered ->
     ok = emqx_hooks:run('client.disconnected', [ClientInfo, Reason, ConnInfo]);
-terminate(Reason, #channel{conninfo = ConnInfo, clientinfo = ClientInfo}) ->
+terminate(Reason, #channel{conninfo = ConnInfo, clientinfo = ClientInfo, will_msg = WillMsg}) ->
+    case WillMsg of
+        undefined -> ok;
+        _ -> publish_will_msg(WillMsg)
+    end,
     ok = emqx_hooks:run('client.disconnected', [ClientInfo, Reason, ConnInfo]).
 
 %%--------------------------------------------------------------------