From 05a5ad0f8ce0a6a9e7c64636d702cd2beeaaa24f Mon Sep 17 00:00:00 2001
From: Feng Lee <feng@emqtt.io>
Date: Sat, 22 Sep 2018 06:14:43 +0800
Subject: [PATCH] Use '0MB' to configure size of force_shutdown_policy

---
 priv/emqx.schema | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/priv/emqx.schema b/priv/emqx.schema
index 681f18705..04ce8f076 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -839,7 +839,7 @@ end}.
 %% Total heap size is the in Erlang 'words' not in 'bytes'.
 %% Zero or negative is to disable.
 {mapping, "zone.$name.force_shutdown_policy", "emqx.zones", [
-  {default, "0 | 0"},
+  {default, "0 | 0MB"},
   {datatype, string}
 ]}.
 
@@ -856,8 +856,14 @@ end}.
                                         bytes => list_to_integer(Bytes)}};
                ("force_shutdown_policy", Val) ->
                     [Len, Siz] = string:tokens(Val, "| "),
-                    {force_shutdown_policy, #{message_queue_len => list_to_integer(Len),
-                                              total_heap_size => list_to_integer(Siz)}};
+                    ShutdownPolicy = case cuttlefish_bytesize:parse(Siz) of
+                                   {error, Reason} ->
+                                       error(Reason);
+                                   Siz1 ->
+                                         #{message_queue_len => list_to_integer(Len),
+                                           total_heap_size   => Siz1}
+                               end,
+                    {force_shutdown_policy, ShutdownPolicy};
                (Opt, Val) ->
                     {list_to_atom(Opt), Val}
             end,