Merge pull request #6132 from errror/master

Fix for PR #5985: sleep in callback context

diff --git a/lualib/rspamadm/dmarc_report.lua b/lualib/rspamadm/dmarc_report.lua
index 28e735d2c514780b32293ca90c94e77ac05f9bf5..90c9299ef727967242f1926314986314a7dafd25 100644 (file)
--- a/lualib/rspamadm/dmarc_report.lua
+++ b/lualib/rspamadm/dmarc_report.lua
@@ -443,9 +443,10 @@ local function send_reports_by_smtp(opts, reports, finish_cb)
         else
           if opts.batch_wait > 0 then
             lua_util.debugm(N, 'sleeping %d seconds before sending next batch', opts.batch_wait)
-            rspamadm_ev_base:sleep(opts.batch_wait)
+            rspamadm_ev_base:sleep(opts.batch_wait, function() args.cont_func(args.next_start) end)
+          else
+             args.cont_func(args.next_start)
           end
-          args.cont_func(args.next_start)
         end
       end
     end