vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes creation of builin endpoints/recipients

Browse source
This commit is contained in:
Simone Mainardi 2020-11-05 19:13:33 +01:00
parent 787ec6a66d
commit 3c8cf8c8ac
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/lua/modules/notification_configs.lua
View file

@ -87,7 +87,7 @@ local function is_endpoint_config_existing(endpoint_conf_name)
for _, conf in pairs(configs) do
if conf.endpoint_conf_name == endpoint_conf_name then
-- Another endpoint with the same name already existing
return true
return true, conf
end
end
@ -151,7 +151,7 @@ local function read_endpoint_config_raw(endpoint_id)
if endpoint_params and endpoint_params ~= '' then
return {
endpoint_key = endpoint_key,
endpoint_id = endpoint_id,
endpoint_id = tonumber(endpoint_id),
-- For backward compatibility, endpoint_id is returned as the endpoint_conf_name when not name is found inside endpoint_conf
endpoint_conf_name = endpoint_params.endpoint_conf_name or endpoint_id,
endpoint_params = endpoint_params
@ -234,8 +234,17 @@ function notification_configs.add_config(endpoint_key, endpoint_conf_name, endpo
end
-- Is the config already existing?
if is_endpoint_config_existing(endpoint_conf_name) then
return {status = "failed", error = {type = "endpoint_config_already_existing", endpoint_conf_name = endpoint_conf_name}}
local is_existing, existing_conf = is_endpoint_config_existing(endpoint_conf_name)
if is_existing then
return {status = "failed",
endpoint_id = existing_conf.endpoint_id,
endpoint_conf_name = existing_conf.endpoint_conf_name,
error = {
type = "endpoint_config_already_existing",
endpoint_conf_name = existing_conf.endpoint_conf_name,
}
}
end
-- Are the submitted params those expected by the endpoint?