Просмотр исходного кода

Merge pull request #8802 from terry-xiaoyu/mysql_aysnc

fix(mysql_bridge): export the query_mode option to the APIs
Xinyu Liu 3 лет назад
Родитель
Сommit
ff60019ffe

+ 2 - 2
apps/emqx_rule_engine/src/emqx_rule_runtime.erl

@@ -509,10 +509,10 @@ inc_action_metrics(ok, RuleId) ->
 inc_action_metrics({ok, _}, RuleId) ->
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.success');
 inc_action_metrics({resource_down, _}, RuleId) ->
-    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.out_of_service'),
+    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'),
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.unknown');
 inc_action_metrics(?RESOURCE_ERROR_M(R, _), RuleId) when ?IS_RES_DOWN(R) ->
-    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.out_of_service'),
+    emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.out_of_service'),
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed.unknown');
 inc_action_metrics(_, RuleId) ->
     emqx_metrics_worker:inc(rule_metrics, RuleId, 'actions.failed'),

+ 2 - 1
lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_mysql.erl

@@ -60,6 +60,7 @@ values(post) ->
             enable_batch => false,
             batch_size => ?DEFAULT_BATCH_SIZE,
             batch_time => ?DEFAULT_BATCH_TIME,
+            query_mode => sync,
             enable_queue => false,
             max_queue_bytes => ?DEFAULT_QUEUE_SIZE
         }
@@ -120,7 +121,7 @@ desc(_) ->
 %% internal
 is_hidden_opts(Field) ->
     lists:member(Field, [
-        query_mode, async_inflight_window
+        async_inflight_window
     ]).
 
 type_field() ->