diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-08-14 16:11:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-14 16:11:03 +0100 |
commit | f8313b3fe5b254439617e2c2131e1e4117848fce (patch) | |
tree | ba1d912fe7c6588d814718aaf5e5753b475b7354 | |
parent | 05cf67521d7a153170bbebbb8caed93d3af322f7 (diff) | |
parent | 9fe4c804c1298586a727f820ff718ca3e1042af5 (diff) | |
download | rspamd-f8313b3fe5b254439617e2c2131e1e4117848fce.tar.gz rspamd-f8313b3fe5b254439617e2c2131e1e4117848fce.zip |
Merge pull request #3005 from CAPSLOCK2000/master
[Minor] Wrap ipv6-adresses in brackets
-rw-r--r-- | lualib/lua_redis.lua | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua index f3ff6d400..27ac53478 100644 --- a/lualib/lua_redis.lua +++ b/lualib/lua_redis.lua @@ -92,6 +92,11 @@ local function redis_query_sentinel(ev_base, params, initialised) for _,m in ipairs(result) do local master = flatten_redis_table(m) + -- Wrap IPv6-adresses in brackets + if (master.ip:match(":")) then + master.ip = "["..master.ip.."]" + end + if params.sentinel_masters_pattern then if master.name:match(params.sentinel_masters_pattern) then lutil.debugm(N, 'found master %s with ip %s and port %s', @@ -122,6 +127,10 @@ local function redis_query_sentinel(ev_base, params, initialised) lutil.debugm(N, rspamd_config, 'found slave form master %s with ip %s and port %s', v.name, slave.ip, slave.port) + -- Wrap IPv6-adresses in brackets + if (slave.ip:match(":")) then + slave.ip = "["..slave.ip.."]" + end v.slaves[#v.slaves + 1] = slave end end |