From 760ed4d924cd4cba44862d107829dfa0d49ede67 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 19 Apr 2024 10:37:24 +1000 Subject: [PATCH] bump sleep for failed sends --- app/Helpers/Mail/GmailTransport.php | 10 +++++++++- app/Helpers/Mail/Office365MailTransport.php | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php index de6582119ea3..e13c6f07923c 100644 --- a/app/Helpers/Mail/GmailTransport.php +++ b/app/Helpers/Mail/GmailTransport.php @@ -70,7 +70,15 @@ class GmailTransport extends AbstractTransport /* Need to slow down */ if ($e->getCode() == '429') { nlog("429 google - retrying "); - $service->users_messages->send('me', $body, []); + + sleep(rand(3,8)); + + try { + $service->users_messages->send('me', $body, []); + } catch(\Google\Service\Exception $e) { + + } + } } } diff --git a/app/Helpers/Mail/Office365MailTransport.php b/app/Helpers/Mail/Office365MailTransport.php index e79c1c1c7f75..258ed9d0ff53 100644 --- a/app/Helpers/Mail/Office365MailTransport.php +++ b/app/Helpers/Mail/Office365MailTransport.php @@ -54,12 +54,19 @@ class Office365MailTransport extends AbstractTransport ->setReturnType(\Microsoft\Graph\Model\Message::class) ->execute(); } catch (\Exception $e) { - sleep(5); + + sleep(rand(5,10)); + + try { $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail') ->attachBody(base64_encode($bcc_list.$message->toString())) ->addHeaders(['Content-Type' => 'text/plain']) ->setReturnType(\Microsoft\Graph\Model\Message::class) ->execute(); + } catch (\Exception $e) { + + } + } }