summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorSimon Rettberg2023-05-12 14:24:15 +0200
committerSimon Rettberg2023-05-12 14:24:15 +0200
commit1e1a9362d24d1768dc140ebfc7150774dc2c055c (patch)
treeb59a0941e62b738eefcac83c6cfdedee20a9b277 /inc
parent[inc/Mailer] Allow Somename <some@example.com> format as FROM (diff)
downloadslx-admin-1e1a9362d24d1768dc140ebfc7150774dc2c055c.tar.gz
slx-admin-1e1a9362d24d1768dc140ebfc7150774dc2c055c.tar.xz
slx-admin-1e1a9362d24d1768dc140ebfc7150774dc2c055c.zip
[inc/Mailer] Remove repeated Expire spam from error log
Diffstat (limited to 'inc')
-rw-r--r--inc/mailer.inc.php3
1 files changed, 2 insertions, 1 deletions
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)