summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Fedotov <hairyhum@gmail.com>2018-05-17 17:07:16 +0100
committerDaniil Fedotov <hairyhum@gmail.com>2018-05-17 17:07:16 +0100
commit0f626e08eb4a70d1674668c82c2a55fdcf59c17d (patch)
tree5703e36092980ae94622cb251847223de5f2d075
parent0fe2422741d1c726de1564b8c4aa9a909191b8b0 (diff)
downloadrabbitmq-server-git-0f626e08eb4a70d1674668c82c2a55fdcf59c17d.tar.gz
Do not parse syslog IP in schema transformer. String IPs are supported anyway.
-rw-r--r--priv/schema/rabbit.schema7
-rw-r--r--test/config_schema_SUITE_data/rabbit.snippets2
2 files changed, 1 insertions, 8 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index 6d82cdc1f5..862537bf61 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -1091,13 +1091,6 @@ end}.
{validators, ["is_ip"]}
]}.
-{translation, "syslog.dest_host",
-fun(Conf) ->
- IpString = cuttlefish:conf_get("log.syslog.ip", Conf),
- {ok, IP} = inet:parse_address(IpString),
- IP
-end}.
-
{mapping, "log.syslog.port", "syslog.dest_port", [
{datatype, integer}
]}.
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index 93546cb1c6..3dce388b79 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -547,7 +547,7 @@ credential_validator.regexp = ^abc\\d+",
{syslog, [{app_name, "rabbitmq"},
{facility, user},
{multiline_mode, true},
- {dest_host, {10, 10, 10, 10}},
+ {dest_host, "10.10.10.10"},
{dest_port, 123}]}
],
[]},