Skip to content

Commit a3f8a64

Browse files
committed
Mark failed.
1 parent 1ec6922 commit a3f8a64

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/Models/MailatorSchedule.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -328,15 +328,10 @@ public function shouldSend(): bool
328328
{
329329
try {
330330
$this->load('logs');
331-
332331
return $this->configurationsPasses() && $this->whenPasses() && $this->eventsPasses();
333-
<<<<<<< Updated upstream
334-
} catch (Exception | Throwable) {
335-
=======
336332
} catch (Exception|Throwable $e) {
337333
$this->markAsFailed($e->getMessage());
338334

339-
>>>>>>> Stashed changes
340335
return false;
341336
}
342337
}
@@ -359,12 +354,8 @@ public function execute(bool $now = false): void
359354
dispatch(new SendMailJob($this));
360355
}
361356
}
362-
<<<<<<< Updated upstream
363-
} catch (Exception | Throwable) {
364-
=======
365357
} catch (Exception|Throwable $e) {
366358
$this->markAsFailed($e->getMessage());
367-
>>>>>>> Stashed changes
368359
}
369360
}
370361

0 commit comments

Comments
 (0)