From 026e1494fbf3d7b1450988b3c46d88e7a6af1161 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Mon, 1 Mar 2021 10:00:38 +0100 Subject: [PATCH] fix(webhook): fix config entry web.hook.api.url -> web.hook.url --- apps/emqx_web_hook/README.md | 2 +- apps/emqx_web_hook/etc/emqx_web_hook.conf | 2 +- apps/emqx_web_hook/priv/emqx_web_hook.schema | 2 +- apps/emqx_web_hook/test/props/prop_webhook_confs.erl | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/emqx_web_hook/README.md b/apps/emqx_web_hook/README.md index 29b5f3ca8..c76c2936d 100644 --- a/apps/emqx_web_hook/README.md +++ b/apps/emqx_web_hook/README.md @@ -11,7 +11,7 @@ Please see: [EMQ X - WebHook](https://docs.emqx.io/broker/latest/en/advanced/web ## The web services URL for Hook request ## ## Value: String -web.hook.api.url = http://127.0.0.1:8080 +web.hook.url = http://127.0.0.1:8080 ## Encode message payload field ## diff --git a/apps/emqx_web_hook/etc/emqx_web_hook.conf b/apps/emqx_web_hook/etc/emqx_web_hook.conf index 218718079..6c50924ff 100644 --- a/apps/emqx_web_hook/etc/emqx_web_hook.conf +++ b/apps/emqx_web_hook/etc/emqx_web_hook.conf @@ -5,7 +5,7 @@ ## Webhook URL ## ## Value: String -web.hook.api.url = http://127.0.0.1:80 +web.hook.url = http://127.0.0.1:80 ## HTTP Headers ## diff --git a/apps/emqx_web_hook/priv/emqx_web_hook.schema b/apps/emqx_web_hook/priv/emqx_web_hook.schema index beed1b107..3a56b8b1d 100644 --- a/apps/emqx_web_hook/priv/emqx_web_hook.schema +++ b/apps/emqx_web_hook/priv/emqx_web_hook.schema @@ -1,7 +1,7 @@ %%-*- mode: erlang -*- %% EMQ X R3.0 config mapping -{mapping, "web.hook.api.url", "emqx_web_hook.url", [ +{mapping, "web.hook.url", "emqx_web_hook.url", [ {datatype, string} ]}. diff --git a/apps/emqx_web_hook/test/props/prop_webhook_confs.erl b/apps/emqx_web_hook/test/props/prop_webhook_confs.erl index bfe170239..cc5e7af64 100644 --- a/apps/emqx_web_hook/test/props/prop_webhook_confs.erl +++ b/apps/emqx_web_hook/test/props/prop_webhook_confs.erl @@ -36,7 +36,7 @@ prop_confs() -> Schema = cuttlefish_schema:files(filelib:wildcard(code:priv_dir(emqx_web_hook) ++ "/*.schema")), ?ALL({Url, Confs0}, {url(), confs()}, begin - Confs = [{"web.hook.api.url", Url}|Confs0], + Confs = [{"web.hook.url", Url}|Confs0], Envs = cuttlefish_generator:map(Schema, cuttlefish_conf_file(Confs)), assert_confs(Confs, Envs), @@ -66,7 +66,7 @@ set_special_cfgs(_) -> application:set_env(emqx, modules_loaded_file, undefined), ok. -assert_confs([{"web.hook.api.url", Url}|More], Envs) -> +assert_confs([{"web.hook.url", Url}|More], Envs) -> %% Assert! Url = deep_get_env("emqx_web_hook.url", Envs), assert_confs(More, Envs);