mirror of
https://github.com/mailscope/kumomta.git
synced 2026-09-05 02:08:18 +00:00
Wez Furlong
d704677e2d
This commit addresses a couple of related issues around scheduled qeueue suspensions: 1. There was no check in the ready queue logic to confirm that a given message was not part of a suspension. Ideally, it wouldn't land in the ready queue if it is suspended, but if you have a large ready queue and one of the messages generates a suspension, then the remainder would get attempted, oblivious to the new suspension. The resolution here is to add a check for that case, log a transfail and requeue the message. 2. We only checked whether the scheduled queue was suspended in the case where a message was being newly inserted into the queuing system. Importantly, messages being promoted from the scheduled queue didn't use this code path. This commit fixes this up by relocating the check to the appropriate location. In addition, we now will log a transfail for this case and delay the message according to its retry schedule. 3. Since we're in here changing the retry schedule for suspensions, take the opportunity to take care of #293 which applies to the more general logic around all sources being suspended. The upshot of this is that we're now logging transfails in a number of suspension cases where we weren't previously, and using the normal retry schedule for those cases where we weren't previously doing that either. refs: https://github.com/KumoCorp/kumomta/issues/290 refs: https://github.com/KumoCorp/kumomta/issues/293
76 lines
2.0 KiB
Lua
76 lines
2.0 KiB
Lua
local kumo = require 'kumo'
|
|
package.path = '../../assets/?.lua;' .. package.path
|
|
local shaping = require 'policy-extras.shaping'
|
|
local utils = require 'policy-extras.policy_utils'
|
|
|
|
local TEST_DIR = os.getenv 'KUMOD_TEST_DIR'
|
|
local SINK_PORT = tonumber(os.getenv 'KUMOD_SMTP_SINK_PORT')
|
|
local TSA_URL =
|
|
string.format('http://127.0.0.1:%s', os.getenv 'KUMOD_TSA_PORT')
|
|
|
|
local shaper = shaping:setup_with_automation {
|
|
publish = { TSA_URL },
|
|
subscribe = { TSA_URL },
|
|
cache_ttl = '1 second',
|
|
no_default_files = true,
|
|
extra_files = { 'shaping.toml' },
|
|
pre_filter = true,
|
|
}
|
|
|
|
kumo.on('init', function()
|
|
kumo.configure_accounting_db_path(TEST_DIR .. '/accounting.db')
|
|
|
|
kumo.start_esmtp_listener {
|
|
listen = '127.0.0.1:0',
|
|
relay_hosts = { '0.0.0.0/0' },
|
|
}
|
|
|
|
kumo.start_http_listener {
|
|
listen = '127.0.0.1:0',
|
|
}
|
|
|
|
kumo.configure_local_logs {
|
|
log_dir = TEST_DIR .. '/logs',
|
|
max_segment_duration = '1s',
|
|
}
|
|
|
|
kumo.define_spool {
|
|
name = 'data',
|
|
path = TEST_DIR .. '/data-spool',
|
|
}
|
|
|
|
kumo.define_spool {
|
|
name = 'meta',
|
|
path = TEST_DIR .. '/meta-spool',
|
|
}
|
|
shaper.setup_publish()
|
|
end)
|
|
|
|
kumo.on('get_listener_domain', function(domain, listener, conn_meta)
|
|
return kumo.make_listener_domain {
|
|
relay_to = true,
|
|
log_oob = true,
|
|
log_arf = true,
|
|
}
|
|
end)
|
|
|
|
kumo.on('smtp_server_message_received', function(msg)
|
|
local tenant = msg:get_first_named_header_value 'X-Tenant'
|
|
local campaign = msg:get_first_named_header_value 'X-campaign'
|
|
msg:import_scheduling_header 'X-Schedule'
|
|
print('****** tenant', tenant, 'camp', campaign)
|
|
msg:set_meta('tenant', tenant)
|
|
msg:set_meta('campaign', campaign)
|
|
msg:set_meta('routing_domain', 'localhost')
|
|
end)
|
|
|
|
kumo.on('get_egress_path_config', function(domain, egress_source, site_name)
|
|
-- Redirect to sink port
|
|
local skip_make = true
|
|
local params =
|
|
shaper.get_egress_path_config(domain, egress_source, site_name, skip_make)
|
|
params.smtp_port = SINK_PORT
|
|
params.prohibited_hosts = {}
|
|
return kumo.make_egress_path(params)
|
|
end)
|