fix(resource): typos on restart a resource

This commit is contained in:
Shawn 2021-12-30 14:40:28 +08:00
parent d11cf6ad64
commit 9d733c2ec5
4 changed files with 8 additions and 12 deletions

View File

@ -112,7 +112,7 @@ If the request is provided, the caller can send HTTP requests via
<code>emqx_resource:query(ResourceId, {send_message, BridgeId, Message})</code> <code>emqx_resource:query(ResourceId, {send_message, BridgeId, Message})</code>
""" """
})} })}
] ++ emqx_connector_schema:common_fields() ++ emqx_connector_schema_lib:ssl_fields(); ] ++ emqx_connector_schema_lib:ssl_fields();
fields("request") -> fields("request") ->
[ {method, hoconsc:mk(hoconsc:enum([post, put, get, delete]), #{nullable => true})} [ {method, hoconsc:mk(hoconsc:enum([post, put, get, delete]), #{nullable => true})}

View File

@ -8,8 +8,6 @@
-export([roots/0, fields/1]). -export([roots/0, fields/1]).
-export([common_fields/0]).
-export([ get_response/0 -export([ get_response/0
, put_request/0 , put_request/0
, post_request/0 , post_request/0
@ -51,10 +49,3 @@ fields("connectors") ->
schema_mod(Type) -> schema_mod(Type) ->
list_to_atom(lists:concat(["emqx_connector_", Type])). list_to_atom(lists:concat(["emqx_connector_", Type])).
common_fields() ->
[ {name,
mk(binary(),
#{ desc => "Connector name, used as a human-readable description of the connector."
})}
].

View File

@ -55,6 +55,11 @@ clientid conflicts between different nodes. And we can only use shared subscript
topic filters for 'remote_topic' of ingress connections. topic filters for 'remote_topic' of ingress connections.
""" """
})} })}
, {name,
sc(binary(),
#{ nullable => true
, desc => "Connector name, used as a human-readable description of the connector."
})}
, {server, , {server,
sc(emqx_schema:ip_port(), sc(emqx_schema:ip_port(),
#{ default => "127.0.0.1:1883" #{ default => "127.0.0.1:1883"
@ -94,7 +99,7 @@ topic filters for 'remote_topic' of ingress connections.
Queue messages in disk files. Queue messages in disk files.
""" """
})} })}
] ++ emqx_connector_schema:common_fields() ++ emqx_connector_schema_lib:ssl_fields(); ] ++ emqx_connector_schema_lib:ssl_fields();
fields("ingress") -> fields("ingress") ->
%% the message maybe subscribed by rules, in this case 'local_topic' is not necessary %% the message maybe subscribed by rules, in this case 'local_topic' is not necessary

View File

@ -217,7 +217,7 @@ do_restart(InstId) ->
case lookup(InstId) of case lookup(InstId) of
{ok, #{mod := Mod, state := ResourceState, config := Config} = Data} -> {ok, #{mod := Mod, state := ResourceState, config := Config} = Data} ->
_ = case ResourceState of _ = case ResourceState of
undefine -> ok; undefined -> ok;
_ -> emqx_resource:call_stop(InstId, Mod, ResourceState) _ -> emqx_resource:call_stop(InstId, Mod, ResourceState)
end, end,
case emqx_resource:call_start(InstId, Mod, Config) of case emqx_resource:call_start(InstId, Mod, Config) of