Browse Source

[Minor] Unify set_pre_result invocations

tags/3.1
Vsevolod Stakhov 2 years ago
parent
commit
89f419a1f7
2 changed files with 9 additions and 9 deletions
  1. 1
    1
      src/lua/lua_task.c
  2. 8
    8
      src/plugins/lua/spamtrap.lua

+ 1
- 1
src/lua/lua_task.c View File

action->name, action->threshold); action->name, action->threshold);
} }


return luaL_error (L, "unknown action %s", lua_tostring (L, 2));
return luaL_error (L, "unknown action %s", act_str);
} }


if (module == NULL) { if (module == NULL) {

+ 8
- 8
src/plugins/lua/spamtrap.lua View File

end end
task:insert_result(settings['symbol'], 1, rcpt) task:insert_result(settings['symbol'], 1, rcpt)


if settings['action'] then
if settings.action then
rspamd_logger.infox(task, 'spamtrap found: <%s>', rcpt) rspamd_logger.infox(task, 'spamtrap found: <%s>', rcpt)
local smtp_message
if settings.smtp_message then if settings.smtp_message then
task:set_pre_result(settings['action'],
lua_util.template(settings.smtp_message, { rcpt = rcpt}), 'spamtrap')
smtp_message = lua_util.template(settings.smtp_message, { rcpt = rcpt})
else else
local smtp_message = 'unknown error'
smtp_message = 'unknown error'
if settings.action == 'no action' then if settings.action == 'no action' then
smtp_message = 'message accepted' smtp_message = 'message accepted'
elseif settings.action == 'reject' then elseif settings.action == 'reject' then
smtp_message = 'message rejected' smtp_message = 'message rejected'
end end
task:set_pre_result{action = settings['action'],
message = smtp_message,
module = 'spamtrap',
flags = act_flags}
end end
task:set_pre_result{action = settings.action,
message = smtp_message,
module = 'spamtrap',
flags = act_flags}
end end
end end



Loading…
Cancel
Save