From 118452c62ff48eed45fdf7b1732f85fc0775287a Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 9 Aug 2021 16:38:07 +0100 Subject: [PATCH] [Minor] Dmarc_report: Try to escape from the coroutines curse --- lualib/rspamadm/dmarc_report.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lualib/rspamadm/dmarc_report.lua b/lualib/rspamadm/dmarc_report.lua index 062e8070e..acc941400 100644 --- a/lualib/rspamadm/dmarc_report.lua +++ b/lualib/rspamadm/dmarc_report.lua @@ -685,14 +685,19 @@ local function handler(args) local function finish_cb(nsuccess, nfail) if not opts.no_opt then lua_util.debugm(N, 'set last report date to %s', os.time()) + -- Hack to avoid coroutines + async functions mess: we use async redis call here + redis_attrs.callback = function() + logger.messagex('Reporting collection has finished %s dates processed, %s reports: %s completed, %s failed', + ndates, nreports, nsuccess, nfail) + end lua_redis.request(redis_params, redis_attrs, {'SETEX', 'rspamd_dmarc_last_collection', dmarc_settings.reporting.keys_expire, tostring(os.time())}) + else + logger.messagex('Reporting collection has finished %s dates processed, %s reports: %s completed, %s failed', + ndates, nreports, nsuccess, nfail) end - logger.messagex('Reporting collection has finished %s dates processed, %s reports: %s completed, %s failed', - ndates, nreports, nsuccess, nfail) - pool:destroy() end send_reports_by_smtp(opts, all_reports, finish_cb) -- 2.39.5