From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Tue, 12 Feb 2019 10:21:46 +0000 (+0100)
Subject: Improve output of wait_for_email_transfer
X-Git-Tag: v1.5~10
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=12d603bfa5475d8060e1c6b9245fe29fe21e4da9;p=pyi2ncommon

Improve output of wait_for_email_transfer

Most of all, warn if timeout was reached without finishing email transfer
---

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):