From 1e1a9362d24d1768dc140ebfc7150774dc2c055c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 12 May 2023 14:24:15 +0200
Subject: [inc/Mailer] Remove repeated Expire spam from error log

---
 inc/mailer.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/mailer.inc.php b/inc/mailer.inc.php
index 05b6a08c..728e91b5 100644
--- a/inc/mailer.inc.php
+++ b/inc/mailer.inc.php
@@ -89,7 +89,8 @@ class Mailer
 
 	public function getLog(): string
 	{
-		return $this->errlog;
+		// Remove repeated "Expire" messages, keep only last one
+		return preg_replace('/^\* Expire in \d+ ms for.*[\\r\\n]+(?=\* Expire)/m','$1', $this->errlog);
 	}
 
 	public static function queue(int $configid, array $rcpts, string $subject, string $text)
-- 
cgit v1.2.3-55-g7522