From 49c5edce2e67939485c5fc933b549b2c5e89e6d3 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Wed, 2 Jun 2021 16:28:52 +0800 Subject: [PATCH] fix(emqx_connector): start emqx_connector_mysql failed --- apps/emqx_connector/priv/emqx_connector.schema | 2 +- apps/emqx_connector/src/emqx_connector.app.src | 3 ++- apps/emqx_connector/src/emqx_connector_app.erl | 2 ++ apps/emqx_resource/src/emqx_resource_instance.erl | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/emqx_connector/priv/emqx_connector.schema b/apps/emqx_connector/priv/emqx_connector.schema index cdc079973..8d81635d5 100644 --- a/apps/emqx_connector/priv/emqx_connector.schema +++ b/apps/emqx_connector/priv/emqx_connector.schema @@ -1,7 +1,7 @@ %%-*- mode: erlang -*- %% emqx_connector config mapping -{mapping, "connectors", "connectors", [ +{mapping, "connectors", "emqx_connector.connectors", [ {default, []}, {datatype, string} ]}. \ No newline at end of file diff --git a/apps/emqx_connector/src/emqx_connector.app.src b/apps/emqx_connector/src/emqx_connector.app.src index 16a1d0869..a821b8f13 100644 --- a/apps/emqx_connector/src/emqx_connector.app.src +++ b/apps/emqx_connector/src/emqx_connector.app.src @@ -6,7 +6,8 @@ {applications, [kernel, stdlib, - emqx_resource + emqx_resource, + ecpool ]}, {env,[]}, {modules, []}, diff --git a/apps/emqx_connector/src/emqx_connector_app.erl b/apps/emqx_connector/src/emqx_connector_app.erl index f554cc117..0ba33e79b 100644 --- a/apps/emqx_connector/src/emqx_connector_app.erl +++ b/apps/emqx_connector/src/emqx_connector_app.erl @@ -11,6 +11,8 @@ -export([start/2, stop/1]). +-export([load_config/0]). + start(_StartType, _StartArgs) -> load_config(), emqx_connector_sup:start_link(). diff --git a/apps/emqx_resource/src/emqx_resource_instance.erl b/apps/emqx_resource/src/emqx_resource_instance.erl index ff7158c9c..60fdea74b 100644 --- a/apps/emqx_resource/src/emqx_resource_instance.erl +++ b/apps/emqx_resource/src/emqx_resource_instance.erl @@ -134,7 +134,7 @@ save_config_to_disk(InstId, ResourceType, Config) -> %% will dump configs for all instances (from an ETS table) to a file. file:write_file(filename:join([emqx_data_dir(), binary_to_list(InstId) ++ ".conf"]), jsx:encode(#{id => InstId, resource_type => ResourceType, - config => emqx_resource:call_config_to_file(Config)})). + config => emqx_resource:call_config_to_file(ResourceType, Config)})). emqx_data_dir() -> "data".