From 12d603bfa5475d8060e1c6b9245fe29fe21e4da9 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Tue, 12 Feb 2019 11:21:46 +0100 Subject: [PATCH] Improve output of wait_for_email_transfer Most of all, warn if timeout was reached without finishing email transfer --- src/arnied_wrapper.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/arnied_wrapper.py b/src/arnied_wrapper.py index d59891a..9a39d62 100644 --- a/src/arnied_wrapper.py +++ b/src/arnied_wrapper.py @@ -312,12 +312,14 @@ def wait_for_email_transfer(timeout=300, vm=None): # Retrigger mail queue in case something is deferred # by an amavisd-new reconfiguration run_cmd(cmd='postqueue -f', vm=vm) - log.info('Waiting for SMTP queue to be empty (%i/%i sec)', + log.info('Waiting for SMTP queue to get empty (%i/%i s)', i, timeout) if not run_cmd(cmd='postqueue -j', vm=vm).stdout: - break + log.debug('SMTP queue is empty') + return time.sleep(1) - log.debug('SMTP queue is empty') + log.warning('Timeout reached but SMTP queue still not empty after {} s' + .format(timeout)) def schedule(program, exec_time=0, optional_args="", vm=None): -- 1.7.1