From ea0975d41cb3dd72834b87ec5264be7d85aa1764 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 19 May 2023 19:43:11 +1000 Subject: [PATCH 1/3] Additional translations --- lang/en/texts.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/en/texts.php b/lang/en/texts.php index c503256f927b..a8b645e600af 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5092,6 +5092,7 @@ $LANG = array( 'duties' => 'Duties', 'order_number' => 'Order Number', 'order_id' => 'Order', + 'total_invoices_outstanding' => 'Total Invoices Outstanding', ); From 4706d756ed6207758397a5738b2f71892d84e0ab Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 19 May 2023 19:49:06 +1000 Subject: [PATCH 2/3] additional translations --- lang/en/texts.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/en/texts.php b/lang/en/texts.php index a8b645e600af..0d420fe76aea 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5093,6 +5093,7 @@ $LANG = array( 'order_number' => 'Order Number', 'order_id' => 'Order', 'total_invoices_outstanding' => 'Total Invoices Outstanding', + 'recent_activity' => 'Recent Activity', ); From 33acfeae9e4a9295b00000c7e0a5072865156eb5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 20 May 2023 11:06:14 +1000 Subject: [PATCH 3/3] Add additiona entropy to Backoff method --- app/Jobs/Mail/NinjaMailerJob.php | 4 +++- app/Jobs/Util/WebhookSingle.php | 4 +++- app/Services/Email/Email.php | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 437cc7233fe9..3b8611bb3f1e 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -72,7 +72,9 @@ class NinjaMailerJob implements ShouldQueue public function backoff() { - return [5, 10, 30, 240]; + // return [5, 10, 30, 240]; + return [rand(5, 10), rand(30, 40), rand(60, 79), rand(160, 400)]; + } public function handle() diff --git a/app/Jobs/Util/WebhookSingle.php b/app/Jobs/Util/WebhookSingle.php index d322738601c0..d840d8544359 100644 --- a/app/Jobs/Util/WebhookSingle.php +++ b/app/Jobs/Util/WebhookSingle.php @@ -63,7 +63,9 @@ class WebhookSingle implements ShouldQueue public function backoff() { - return [15, 35, 65, 185, 3605]; + // return [15, 35, 65, 185, 3605]; + return [rand(10, 15), rand(30, 40), rand(60, 79), rand(160, 200), rand(3000, 5000)]; + } /** diff --git a/app/Services/Email/Email.php b/app/Services/Email/Email.php index ddbfee25fb92..6f0488c2be96 100644 --- a/app/Services/Email/Email.php +++ b/app/Services/Email/Email.php @@ -75,7 +75,8 @@ class Email implements ShouldQueue */ public function backoff() { - return [10, 30, 60, 240]; + // return [10, 30, 60, 240]; + return [rand(5, 10), rand(30, 40), rand(60, 79), rand(160, 400)]; } public function handle()