retransmits = retransmits - 1
- lua_util.debugm(rule.N, task, '%s: Request Error: %s - retries left: %s',
+ lua_util.debugm(rule.name, task, '%s: Request Error: %s - retries left: %s',
rule.log_prefix, err, retransmits)
-- Select a different upstream!
upstream = rule.upstreams:get_upstream_round_robin()
addr = upstream:get_addr()
- lua_util.debugm(rule.N, task, '%s: retry IP: %s:%s',
+ lua_util.debugm(rule.name, task, '%s: retry IP: %s:%s',
rule.log_prefix, addr, addr:get_port())
tcp.request({
-- Parse the response
if upstream then upstream:ok() end
local _,_,result,disposition,header = tostring(data):find("(.-)\n(.-)\n(.-)\n")
- lua_util.debugm(rule.N, task, 'DCC result=%1 disposition=%2 header="%3"',
+ lua_util.debugm(rule.name, task, 'DCC result=%1 disposition=%2 header="%3"',
result, disposition, header)
if header then
rspamd_logger.infox(task, '%s: clean, returned result A - info: %s',
rule.log_prefix, info)
else
- lua_util.debugm(rule.N, task, '%s: returned result A - info: %s',
+ lua_util.debugm(rule.name, task, '%s: returned result A - info: %s',
rule.log_prefix, info)
end
end
if rule.log_clean then
rspamd_logger.infox(task, '%s: clean, returned result G - info: %s', rule.log_prefix, info)
else
- lua_util.debugm(rule.N, task, '%s: returned result G - info: %s', rule.log_prefix, info)
+ lua_util.debugm(rule.name, task, '%s: returned result G - info: %s', rule.log_prefix, info)
end
elseif result == 'S' then
-- do nothing
if rule.log_clean then
rspamd_logger.infox(task, '%s: clean, returned result S - info: %s', rule.log_prefix, info)
else
- lua_util.debugm(rule.N, task, '%s: returned result S - info: %s', rule.log_prefix, info)
+ lua_util.debugm(rule.name, task, '%s: returned result S - info: %s', rule.log_prefix, info)
end
else
-- Unknown result
local function dcc_config(opts)
local dcc_conf = {
- N = N,
+ name = N,
default_port = 10045,
timeout = 5.0,
log_clean = false,
dcc_conf = lua_util.override_defaults(dcc_conf, opts)
if not dcc_conf.prefix then
- dcc_conf.prefix = 'rs_' .. dcc_conf.N .. '_'
+ dcc_conf.prefix = 'rs_' .. dcc_conf.name .. '_'
end
if not dcc_conf.log_prefix then
- if dcc_conf.name:lower() == dcc_conf.type:lower() then
- dcc_conf.log_prefix = dcc_conf.name
- else
- dcc_conf.log_prefix = dcc_conf.name .. ' (' .. dcc_conf.type .. ')'
- end
+ dcc_conf.log_prefix = dcc_conf.name
end
if not dcc_conf.servers and dcc_conf.socket then
dcc_conf.default_port)
if dcc_conf.upstreams then
- lua_util.add_debug_alias('external_services', dcc_conf.N)
+ lua_util.add_debug_alias('external_services', dcc_conf.name)
return dcc_conf
end