From 41820e3bbd8ebc9d9541bede6b6c044a6700ca2a Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Fri, 23 Jul 2021 15:20:40 +0800
Subject: [PATCH] refactor(config): change sysmon.os.cpu_check_interval to ms

---
 apps/emqx/src/emqx_os_mon.erl        | 2 +-
 apps/emqx/src/emqx_schema.erl        | 2 +-
 apps/emqx/test/emqx_os_mon_SUITE.erl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/emqx/src/emqx_os_mon.erl b/apps/emqx/src/emqx_os_mon.erl
index b70c27e1b..2d928e393 100644
--- a/apps/emqx/src/emqx_os_mon.erl
+++ b/apps/emqx/src/emqx_os_mon.erl
@@ -128,5 +128,5 @@ start_check_timer() ->
     Interval = emqx_config:get([sysmon, os, cpu_check_interval]),
     case erlang:system_info(system_architecture) of
         "x86_64-pc-linux-musl" -> ok;
-        _ -> emqx_misc:start_timer(timer:seconds(Interval), check)
+        _ -> emqx_misc:start_timer(Interval, check)
     end.
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 818f659e8..4c0e651f9 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -507,7 +507,7 @@ fields("sysmon_vm") ->
     ];
 
 fields("sysmon_os") ->
-    [ {"cpu_check_interval", t(duration_s(), undefined, 60)}
+    [ {"cpu_check_interval", t(duration(), undefined, 60)}
     , {"cpu_high_watermark", t(percent(), undefined, "80%")}
     , {"cpu_low_watermark", t(percent(), undefined, "60%")}
     , {"mem_check_interval", maybe_disabled(duration_s(), 60)}
diff --git a/apps/emqx/test/emqx_os_mon_SUITE.erl b/apps/emqx/test/emqx_os_mon_SUITE.erl
index 6c9ac51c2..6e6d6e861 100644
--- a/apps/emqx/test/emqx_os_mon_SUITE.erl
+++ b/apps/emqx/test/emqx_os_mon_SUITE.erl
@@ -25,7 +25,7 @@ all() -> emqx_ct:all(?MODULE).
 
 init_per_suite(Config) ->
     emqx_config:put([sysmon, os], #{
-        cpu_check_interval => 60,cpu_high_watermark => 0.8,
+        cpu_check_interval => 60000,cpu_high_watermark => 0.8,
         cpu_low_watermark => 0.6,mem_check_interval => 60,
         procmem_high_watermark => 0.05,sysmem_high_watermark => 0.7}),
     application:ensure_all_started(os_mon),