From 9e35032d78f569372ab26b37f7bee6a5720f7c8e Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Tue, 16 Aug 2022 10:09:02 +0800
Subject: [PATCH] fix: make resume_interval defaults to health_check_interval

---
 .../src/schema/emqx_bridge_webhook_schema.erl        |  2 ++
 .../i18n/emqx_resource_schema_i18n.conf              | 12 ++++++++++++
 apps/emqx_resource/include/emqx_resource.hrl         |  1 +
 apps/emqx_resource/src/emqx_resource_worker.erl      |  2 +-
 .../src/schema/emqx_resource_schema.erl              |  5 ++++-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_bridge/src/schema/emqx_bridge_webhook_schema.erl b/apps/emqx_bridge/src/schema/emqx_bridge_webhook_schema.erl
index 717acdfad..7c19e9e55 100644
--- a/apps/emqx_bridge/src/schema/emqx_bridge_webhook_schema.erl
+++ b/apps/emqx_bridge/src/schema/emqx_bridge_webhook_schema.erl
@@ -34,6 +34,8 @@ fields("creation_opts") ->
 
 desc("config") ->
     ?DESC("desc_config");
+desc("creation_opts") ->
+    ?DESC(emqx_resource_schema, "creation_opts");
 desc(Method) when Method =:= "get"; Method =:= "put"; Method =:= "post" ->
     ["Configuration for WebHook using `", string:to_upper(Method), "` method."];
 desc(_) ->
diff --git a/apps/emqx_resource/i18n/emqx_resource_schema_i18n.conf b/apps/emqx_resource/i18n/emqx_resource_schema_i18n.conf
index fab55badb..ce4c7e3b0 100644
--- a/apps/emqx_resource/i18n/emqx_resource_schema_i18n.conf
+++ b/apps/emqx_resource/i18n/emqx_resource_schema_i18n.conf
@@ -1,4 +1,5 @@
 emqx_resource_schema {
+
   resource_opts {
     desc {
       en: """Resource options."""
@@ -10,6 +11,17 @@ emqx_resource_schema {
     }
   }
 
+  creation_opts {
+    desc {
+      en: """Creation options."""
+      zh: """资源启动相关的选项。"""
+    }
+    label {
+      en: """Creation Options"""
+      zh: """资源启动选项"""
+    }
+  }
+
   health_check_interval {
     desc {
       en: """Health check interval, in milliseconds."""
diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index 988950420..04b3f16ea 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -66,6 +66,7 @@
     enable_queue => boolean(),
     queue_max_bytes => integer(),
     query_mode => async | sync | dynamic,
+    resume_interval => integer(),
     async_inflight_window => integer()
 }.
 -type query_result() ::
diff --git a/apps/emqx_resource/src/emqx_resource_worker.erl b/apps/emqx_resource/src/emqx_resource_worker.erl
index 457f8c91a..26b9706c9 100644
--- a/apps/emqx_resource/src/emqx_resource_worker.erl
+++ b/apps/emqx_resource/src/emqx_resource_worker.erl
@@ -135,7 +135,7 @@ init({Id, Index, Opts}) ->
         batch_size => BatchSize,
         batch_time => maps:get(batch_time, Opts, ?DEFAULT_BATCH_TIME),
         queue => Queue,
-        resume_interval => maps:get(health_check_interval, Opts, ?HEALTHCHECK_INTERVAL),
+        resume_interval => maps:get(resume_interval, Opts, ?HEALTHCHECK_INTERVAL),
         acc => [],
         acc_left => BatchSize,
         tref => undefined
diff --git a/apps/emqx_resource/src/schema/emqx_resource_schema.erl b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
index ed13f91e3..2272234f2 100644
--- a/apps/emqx_resource/src/schema/emqx_resource_schema.erl
+++ b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
@@ -21,7 +21,7 @@
 
 -import(hoconsc, [mk/2, enum/1, ref/2]).
 
--export([namespace/0, roots/0, fields/1]).
+-export([namespace/0, roots/0, fields/1, desc/1]).
 
 %% -------------------------------------------------------------------------------------------------
 %% Hocon Schema Definitions
@@ -122,3 +122,6 @@ queue_max_bytes(desc) -> ?DESC("queue_max_bytes");
 queue_max_bytes(default) -> ?DEFAULT_QUEUE_SIZE_RAW;
 queue_max_bytes(required) -> false;
 queue_max_bytes(_) -> undefined.
+
+desc("creation_opts") ->
+    ?DESC("creation_opts").