Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2024-04-03 17:37:21 +11:00
parent b6d1a561c3
commit 38c22f29b2
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -70,9 +70,7 @@ class NinjaMailerJob implements ShouldQueue
public function backoff()
{
// return [5, 10, 30, 240];
return [rand(5, 10), rand(30, 40), rand(60, 79), rand(160, 400)];
return [rand(5, 29), rand(30, 59), rand(61, 100), rand(180, 500)];
}
public function handle()
@ -182,6 +180,11 @@ class NinjaMailerJob implements ShouldQueue
$this->fail();
$this->logMailError($e->getMessage(), $this->company->clients()->first());
if ($this->nmo->entity) {
$this->entityEmailFailed($message);
}
$this->cleanUpMailers();
return;
@ -195,6 +198,11 @@ class NinjaMailerJob implements ShouldQueue
$this->fail();
$this->logMailError($message, $this->company->clients()->first());
if ($this->nmo->entity) {
$this->entityEmailFailed($message);
}
$this->cleanUpMailers();
return;
@ -203,7 +211,7 @@ class NinjaMailerJob implements ShouldQueue
//only report once, not on all tries
if ($this->attempts() == $this->tries) {
/* If the is an entity attached to the message send a failure mailer */
/* If there is an entity attached to the message send a failure mailer */
if ($this->nmo->entity) {
$this->entityEmailFailed($message);
}

9
app/Services/Email/Email.php
View File

@ -93,7 +93,7 @@ class Email implements ShouldQueue
*/
public function backoff()
{
return [rand(10, 20), rand(30, 45), rand(60, 79), rand(160, 400)];
return [rand(5, 29), rand(30, 59), rand(61, 100), rand(180, 500)];
}
/**
@ -314,6 +314,8 @@ class Email implements ShouldQueue
$this->logMailError($e->getMessage(), $this->company->clients()->first());
$this->cleanUpMailers();
$this->entityEmailFailed($message);
return;
}
@ -329,6 +331,8 @@ class Email implements ShouldQueue
$this->logMailError($message, $this->company->clients()->first());
$this->cleanUpMailers();
$this->entityEmailFailed($message);
return;
}
@ -343,11 +347,12 @@ class Email implements ShouldQueue
if ($message_body && property_exists($message_body, 'Message')) {
$message = $message_body->Message;
nlog($message);
}
$this->fail();
$this->entityEmailFailed($message);
$this->cleanUpMailers();
return;
}

3
lang/en/texts.php
View File

@ -3155,7 +3155,7 @@ $lang = array(
'archived_group' => 'Successfully archived group',
'deleted_group' => 'Successfully deleted group',
'restored_group' => 'Successfully restored group',
'upload_logo' => 'Upload Logo',
'upload_logo' => 'Upload Your Company Logo',
'uploaded_logo' => 'Successfully uploaded logo',
'saved_settings' => 'Successfully saved settings',
'device_settings' => 'Device Settings',
@ -5271,6 +5271,7 @@ $lang = array(
'show_table_footer' => 'Show table footer',
'show_table_footer_help' => 'Displays the totals in the footer of the table',
'total_invoices' => 'Total Invoices',
'add_to_group' => 'Add to group',
);
return $lang;