Skip to content
Snippets Groups Projects
Commit 3c371fe8 authored by Florian Azizian's avatar Florian Azizian
Browse files

FIX #11895 TIME 2:10 Test E2E + fix tu

parent 1bbc5ab3
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,7 @@ job_e2e: ...@@ -65,7 +65,7 @@ job_e2e:
- test/e2e/screenshots/*.png - test/e2e/screenshots/*.png
- queries_error.log - queries_error.log
expire_in: 1 week expire_in: 1 week
# when: on_failure when: always
allow_failure: true allow_failure: true
# only: # only:
# - schedules # - schedules
......
...@@ -643,11 +643,17 @@ class EmailController ...@@ -643,11 +643,17 @@ class EmailController
$phpmailer->SMTPDebug = 1; $phpmailer->SMTPDebug = 1;
$phpmailer->Debugoutput = function ($str) { $phpmailer->Debugoutput = function ($str) {
if (strpos($str, 'SMTP ERROR') !== false) { if (strpos($str, 'SMTP ERROR') !== false) {
if (!empty($GLOBALS['id'])) {
$user = $GLOBALS['id'];
} else {
$user = UserModel::get(['select' => ['id'], 'orderBy' => ["user_id='superadmin' desc"], 'limit' => 1])[0]['id'];
}
HistoryController::add([ HistoryController::add([
'tableName' => 'emails', 'tableName' => 'emails',
'recordId' => 'email', 'recordId' => 'email',
'eventType' => 'ERROR', 'eventType' => 'ERROR',
'eventId' => 'sendEmail', 'eventId' => 'sendEmail',
'userId' => $user,
'info' => $str 'info' => $str
]); ]);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment