Merge pull request #7550 from EMQ-YangM/add_try_catch
fix: discard rpc call failed data
This commit is contained in:
commit
70e29b08e6
|
@ -2,7 +2,8 @@
|
||||||
%% Unless you know what you are doing, DO NOT edit manually!!
|
%% Unless you know what you are doing, DO NOT edit manually!!
|
||||||
{VSN,
|
{VSN,
|
||||||
[{"4.3.8",
|
[{"4.3.8",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
||||||
|
@ -11,7 +12,8 @@
|
||||||
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.7",
|
{"4.3.7",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
||||||
|
@ -21,7 +23,8 @@
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.6",
|
{"4.3.6",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
||||||
|
@ -31,7 +34,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.5",
|
{"4.3.5",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.5"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.5"]}},
|
||||||
|
@ -41,7 +45,8 @@
|
||||||
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.4",
|
{"4.3.4",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.4"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.4"]}},
|
||||||
|
@ -51,7 +56,8 @@
|
||||||
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.3",
|
{"4.3.3",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.3"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.3"]}},
|
||||||
|
@ -62,7 +68,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.2",
|
{"4.3.2",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.2"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.2"]}},
|
||||||
|
@ -74,7 +81,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.1",
|
{"4.3.1",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.1"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.1"]}},
|
||||||
|
@ -86,7 +94,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.0",
|
{"4.3.0",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.0"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.0"]}},
|
||||||
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
||||||
|
@ -99,7 +108,8 @@
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{<<".*">>,[]}],
|
{<<".*">>,[]}],
|
||||||
[{"4.3.8",
|
[{"4.3.8",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
||||||
|
@ -108,7 +118,8 @@
|
||||||
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.7",
|
{"4.3.7",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_metrics,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
||||||
|
@ -118,7 +129,8 @@
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.6",
|
{"4.3.6",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
|
||||||
|
@ -128,7 +140,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.5",
|
{"4.3.5",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.5"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.5"]}},
|
||||||
|
@ -138,7 +151,8 @@
|
||||||
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.4",
|
{"4.3.4",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.4"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.4"]}},
|
||||||
|
@ -148,7 +162,8 @@
|
||||||
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.3",
|
{"4.3.3",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.3"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.3"]}},
|
||||||
|
@ -159,7 +174,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.2",
|
{"4.3.2",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.2"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.2"]}},
|
||||||
|
@ -171,7 +187,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.1",
|
{"4.3.1",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.1"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.1"]}},
|
||||||
|
@ -183,7 +200,8 @@
|
||||||
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.0",
|
{"4.3.0",
|
||||||
[{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_rule_engine_cli,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_rule_sqltester,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
|
||||||
{update,emqx_rule_metrics,{advanced,["4.3.0"]}},
|
{update,emqx_rule_metrics,{advanced,["4.3.0"]}},
|
||||||
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
|
||||||
|
|
|
@ -323,13 +323,13 @@ show_resource(#{id := Id}, _Params) ->
|
||||||
case emqx_rule_registry:find_resource(Id) of
|
case emqx_rule_registry:find_resource(Id) of
|
||||||
{ok, R} ->
|
{ok, R} ->
|
||||||
Status =
|
Status =
|
||||||
[begin
|
lists:concat(
|
||||||
St = case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of
|
[ case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of
|
||||||
{ok, St0} -> St0;
|
{badrpc, _} -> [];
|
||||||
{error, _} -> #{is_alive => false}
|
{ok, St} -> [maps:put(node, Node, St)];
|
||||||
end,
|
{error, _} -> [maps:put(node, Node, #{is_alive => false})]
|
||||||
maps:put(node, Node, St)
|
end
|
||||||
end || Node <- ekka_mnesia:running_nodes()],
|
|| Node <- ekka_mnesia:running_nodes()]),
|
||||||
return({ok, maps:put(status, Status, record_to_map(R))});
|
return({ok, maps:put(status, Status, record_to_map(R))});
|
||||||
not_found ->
|
not_found ->
|
||||||
return({error, 404, <<"Not Found">>})
|
return({error, 404, <<"Not Found">>})
|
||||||
|
@ -575,9 +575,17 @@ sort_by(Pos, TplList) ->
|
||||||
end, TplList).
|
end, TplList).
|
||||||
|
|
||||||
get_rule_metrics(Id) ->
|
get_rule_metrics(Id) ->
|
||||||
[maps:put(node, Node, rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]))
|
lists:concat(
|
||||||
|| Node <- ekka_mnesia:running_nodes()].
|
[ case rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]) of
|
||||||
|
{badrpc, _} -> [];
|
||||||
|
Res -> [maps:put(node, Node, Res)]
|
||||||
|
end
|
||||||
|
|| Node <- ekka_mnesia:running_nodes()]).
|
||||||
|
|
||||||
get_action_metrics(Id) ->
|
get_action_metrics(Id) ->
|
||||||
[maps:put(node, Node, rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]))
|
lists:concat(
|
||||||
|| Node <- ekka_mnesia:running_nodes()].
|
[ case rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]) of
|
||||||
|
{badrpc, _} -> [];
|
||||||
|
Res -> [maps:put(node, Node, Res)]
|
||||||
|
end
|
||||||
|
|| Node <- ekka_mnesia:running_nodes()]).
|
||||||
|
|
|
@ -273,10 +273,13 @@ format(#resource{id = Id,
|
||||||
config = Config,
|
config = Config,
|
||||||
description = Descr}) ->
|
description = Descr}) ->
|
||||||
Status =
|
Status =
|
||||||
[begin
|
lists:concat(
|
||||||
{ok, St} = rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]),
|
[ case rpc:call(Node, emqx_rule_engine, get_resource_status, [Id]) of
|
||||||
maps:put(node, Node, St)
|
{badrpc, _} -> [];
|
||||||
end || Node <- [node()| nodes()]],
|
{ok, St} -> [maps:put(node, Node, St)];
|
||||||
|
{error, _} -> [maps:put(node, Node, #{is_alive => false})]
|
||||||
|
end
|
||||||
|
|| Node <- ekka_mnesia:running_nodes()]),
|
||||||
lists:flatten(io_lib:format("resource(id='~s', type='~s', config=~0p, status=~0p, description='~s')~n", [Id, Type, Config, Status, Descr]));
|
lists:flatten(io_lib:format("resource(id='~s', type='~s', config=~0p, status=~0p, description='~s')~n", [Id, Type, Config, Status, Descr]));
|
||||||
|
|
||||||
format(#resource_type{name = Name,
|
format(#resource_type{name = Name,
|
||||||
|
@ -369,12 +372,20 @@ get_actions() ->
|
||||||
emqx_rule_registry:get_actions().
|
emqx_rule_registry:get_actions().
|
||||||
|
|
||||||
get_rule_metrics(Id) ->
|
get_rule_metrics(Id) ->
|
||||||
[maps:put(node, Node, rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]))
|
lists:concat(
|
||||||
|| Node <- [node()| nodes()]].
|
[ case rpc:call(Node, emqx_rule_metrics, get_rule_metrics, [Id]) of
|
||||||
|
{badrpc, _} -> [];
|
||||||
|
Res -> [maps:put(node, Node, Res)]
|
||||||
|
end
|
||||||
|
|| Node <- ekka_mnesia:running_nodes()]).
|
||||||
|
|
||||||
get_action_metrics(Id) ->
|
get_action_metrics(Id) ->
|
||||||
[maps:put(node, Node, rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]))
|
lists:concat(
|
||||||
|| Node <- [node()| nodes()]].
|
[ case rpc:call(Node, emqx_rule_metrics, get_action_metrics, [Id]) of
|
||||||
|
{badrpc, _} -> [];
|
||||||
|
Res -> [maps:put(node, Node, Res)]
|
||||||
|
end
|
||||||
|
|| Node <- ekka_mnesia:running_nodes()]).
|
||||||
|
|
||||||
on_failed(continue) -> continue;
|
on_failed(continue) -> continue;
|
||||||
on_failed(stop) -> stop;
|
on_failed(stop) -> stop;
|
||||||
|
|
Loading…
Reference in New Issue