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