Prechádzať zdrojové kódy

Merge pull request #10305 from zmstone/0331-docs-fix-bridge-batch-size-desc

docs: fix max batch size desc
Zaiming (Stone) Shi 3 rokov pred
rodič
commit
36240d310c

+ 21 - 4
apps/emqx/test/emqx_banned_SUITE.erl

@@ -154,7 +154,12 @@ t_session_taken(_) ->
             {clean_start, false},
             {properties, #{'Session-Expiry-Interval' => 120}}
         ]),
-        {ok, _} = emqtt:connect(C),
+        case emqtt:connect(C) of
+            {ok, _} ->
+                ok;
+            {error, econnrefused} ->
+                throw(mqtt_listener_not_ready)
+        end,
         {ok, _, [0]} = emqtt:subscribe(C, Topic, []),
         C
     end,
@@ -168,9 +173,21 @@ t_session_taken(_) ->
             lists:seq(1, MsgNum)
         )
     end,
-
-    C1 = Connect(),
-    ok = emqtt:disconnect(C1),
+    emqx_common_test_helpers:wait_for(
+        ?FUNCTION_NAME,
+        ?LINE,
+        fun() ->
+            try
+                C = Connect(),
+                emqtt:disconnect(C),
+                true
+            catch
+                throw:mqtt_listener_not_ready ->
+                    false
+            end
+        end,
+        3000
+    ),
 
     Publish(),
 

+ 4 - 4
apps/emqx_resource/i18n/emqx_resource_schema_i18n.conf

@@ -149,11 +149,11 @@ When disabled the messages are buffered in RAM only."""
   batch_size {
     desc {
       en: """Maximum batch count. If equal to 1, there's effectively no batching."""
-      zh: """批量请求大小。如果设为1,则无批处理。"""
+      zh: """最大批量请求大小。如果设为1,则无批处理。"""
     }
     label {
-      en: """Batch size"""
-      zh: """批量请求大小"""
+      en: """Max batch size"""
+      zh: """最大批量请求大小"""
     }
   }
 
@@ -163,7 +163,7 @@ When disabled the messages are buffered in RAM only."""
       zh: """在较低消息率情况下尝试累积批量输出时的最大等待间隔,以提高资源的利用率。"""
     }
     label {
-      en: """Max Batch Wait Time"""
+      en: """Max batch wait time"""
       zh: """批量等待最大间隔"""
     }
   }