Skip to content

Commit a9bfec8

Browse files
stephanschulerstephanschuler
committed
feat: Rename Retry to SchedulingCoordinator
The object formerly known as Retry actually calls the scheduler in way to have jobs scheduled afterwards with proper retry settings.
1 parent e57efc9 commit a9bfec8

6 files changed

Lines changed: 26 additions & 27 deletions

File tree

‎Classes/Command/SchedulerCommandController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Neos\Flow\Log\ThrowableStorageInterface;
1515
use Netlogix\JobQueue\Scheduled\AsScheduledJob\SchedulingInformation;
1616
use Netlogix\JobQueue\Scheduled\Domain\Model\ScheduledJob;
17-
use Netlogix\JobQueue\Scheduled\Domain\Retry;
17+
use Netlogix\JobQueue\Scheduled\Domain\SchedulingCoordinator;
1818
use Netlogix\JobQueue\Scheduled\Domain\Scheduler;
1919

2020
/**
@@ -103,7 +103,7 @@ public function pollForIncomingJobsCommand(string $groupName): void
103103
protected function queueDueJobs(string $groupName, int $endTime): int
104104
{
105105
$numberOfHandledJobs = 0;
106-
$retry = new Retry($this->scheduler);
106+
$retry = new SchedulingCoordinator($this->scheduler);
107107

108108
while ($next = $this->scheduler->next($groupName)) {
109109
try {

Classes/Domain/Retry.php renamed to Classes/Domain/SchedulingCoordinator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Netlogix\JobQueue\Scheduled\Domain\Model\ScheduledJob;
1010
use Netlogix\JobQueue\Scheduled\DueDateCalculation\TimeBaseForDueDateCalculation;
1111

12-
class Retry
12+
class SchedulingCoordinator
1313
{
1414
const DEFAULT_BACKOFF_STRATEGY = 'linear';
1515
const DEFAULT_NUMBER_OF_RETRIES = -1;

Tests/Functional/Retry/ExponentialRetryTest.php renamed to Tests/Functional/SchedulingCoordinator/ExponentialRetryTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\Retry;
4+
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\SchedulingCoordinator;
55

66
use Netlogix\JobQueue\Scheduled\Domain\Model\ScheduledJob;
7-
use Netlogix\JobQueue\Scheduled\Domain\Retry;
7+
use Netlogix\JobQueue\Scheduled\Domain\SchedulingCoordinator;
88
use Netlogix\JobQueue\Scheduled\Domain\Scheduler;
99

1010
class ExponentialRetryTest extends TestCase
@@ -24,7 +24,7 @@ public function Jobs_with_no_retries_dont_get_rescheduled(): void
2424
'some-claim'
2525
);
2626

27-
$retry = new Retry($this->scheduler);
27+
$retry = new SchedulingCoordinator($this->scheduler);
2828
$retry->injectQueueManager($this->queueManager([
2929
'scheduledJobs' => [
3030
'backoffStrategy' => 'exponential',
@@ -53,7 +53,7 @@ public function Jobs_with_negative_retries_get_retried_infinitely(): void
5353
$incarnation
5454
);
5555

56-
$retry = new Retry($this->scheduler);
56+
$retry = new SchedulingCoordinator($this->scheduler);
5757
$retry->injectQueueManager($this->queueManager([
5858
'scheduledJobs' => [
5959
'backoffStrategy' => 'exponential',
@@ -82,7 +82,7 @@ public function Default_interval_is_zero(): void
8282
$incarnation
8383
);
8484

85-
$retry = new Retry($this->scheduler);
85+
$retry = new SchedulingCoordinator($this->scheduler);
8686
$retry->injectQueueManager($this->queueManager([
8787
'scheduledJobs' => [
8888
'backoffStrategy' => 'exponential',
@@ -115,7 +115,7 @@ public function Retry_adds_increasing_date_intervals(int $incarnation, int $dela
115115
$incarnation
116116
);
117117

118-
$retry = new Retry($this->scheduler);
118+
$retry = new SchedulingCoordinator($this->scheduler);
119119
$retry->injectQueueManager($this->queueManager([
120120
'scheduledJobs' => [
121121
'backoffStrategy' => 'exponential',
@@ -173,7 +173,7 @@ public function Retries_are_skipped_after_limit_is_reached(): void
173173
'some-claim'
174174
);
175175

176-
$retry = new Retry($this->scheduler);
176+
$retry = new SchedulingCoordinator($this->scheduler);
177177
$retry->injectQueueManager($this->queueManager([
178178
'scheduledJobs' => [
179179
'backoffStrategy' => 'exponential',

Tests/Functional/Retry/LinearRetryTest.php renamed to Tests/Functional/SchedulingCoordinator/LinearRetryTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\Retry;
4+
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\SchedulingCoordinator;
55

66
use Netlogix\JobQueue\Scheduled\Domain\Model\ScheduledJob;
7-
use Netlogix\JobQueue\Scheduled\Domain\Retry;
7+
use Netlogix\JobQueue\Scheduled\Domain\SchedulingCoordinator;
88
use Netlogix\JobQueue\Scheduled\Domain\Scheduler;
99

1010
class LinearRetryTest extends TestCase
@@ -24,7 +24,7 @@ public function Jobs_with_no_retries_dont_get_rescheduled(): void
2424
'some-claim'
2525
);
2626

27-
$retry = new Retry($this->scheduler);
27+
$retry = new SchedulingCoordinator($this->scheduler);
2828
$retry->injectQueueManager($this->queueManager([
2929
'scheduledJobs' => [
3030
'backoffStrategy' => 'linear',
@@ -53,7 +53,7 @@ public function Jobs_with_negative_retries_get_retried_infinitely(): void
5353
$incarnation
5454
);
5555

56-
$retry = new Retry($this->scheduler);
56+
$retry = new SchedulingCoordinator($this->scheduler);
5757
$retry->injectQueueManager($this->queueManager([
5858
'scheduledJobs' => [
5959
'backoffStrategy' => 'linear',
@@ -82,7 +82,7 @@ public function Default_interval_is_zero(): void
8282
$incarnation
8383
);
8484

85-
$retry = new Retry($this->scheduler);
85+
$retry = new SchedulingCoordinator($this->scheduler);
8686
$retry->injectQueueManager($this->queueManager([
8787
'scheduledJobs' => [
8888
'backoffStrategy' => 'linear',
@@ -115,7 +115,7 @@ public function Retry_adds_the_retryInterval_in_seconds(): void
115115
$incarnation
116116
);
117117

118-
$retry = new Retry($this->scheduler);
118+
$retry = new SchedulingCoordinator($this->scheduler);
119119
$retry->injectQueueManager($this->queueManager([
120120
'scheduledJobs' => [
121121
'backoffStrategy' => 'linear',
@@ -147,7 +147,7 @@ public function Retries_are_skipped_after_limit_is_reached(): void
147147
'some-claim'
148148
);
149149

150-
$retry = new Retry($this->scheduler);
150+
$retry = new SchedulingCoordinator($this->scheduler);
151151
$retry->injectQueueManager($this->queueManager([
152152
'scheduledJobs' => [
153153
'backoffStrategy' => 'linear',

Tests/Functional/Retry/RetryTest.php renamed to Tests/Functional/SchedulingCoordinator/SchedulingTest.php

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\Retry;
4+
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\SchedulingCoordinator;
55

6-
use DateInterval;
76
use Netlogix\JobQueue\Scheduled\Domain\Model\ScheduledJob;
8-
use Netlogix\JobQueue\Scheduled\Domain\Retry;
7+
use Netlogix\JobQueue\Scheduled\Domain\SchedulingCoordinator;
98
use Netlogix\JobQueue\Scheduled\Domain\Scheduler;
109

11-
class RetryTest extends TestCase
10+
class SchedulingTest extends TestCase
1211
{
1312
/**
1413
* @test
@@ -23,7 +22,7 @@ public function Marking_a_job_for_rescheduling_does_not_schedule_it(): void
2322
'my-identifier'
2423
);
2524

26-
$retry = new Retry($this->scheduler);
25+
$retry = new SchedulingCoordinator($this->scheduler);
2726
$retry->markJobForRescheduling($job);
2827

2928
$all = $this->findAll();
@@ -50,7 +49,7 @@ public function Marking_a_job_for_rescheduling_and_scheduling_all_does_not_sched
5049
'my-second-identifier'
5150
);
5251

53-
$retry = new Retry($this->scheduler);
52+
$retry = new SchedulingCoordinator($this->scheduler);
5453
$retry->injectQueueManager($this->queueManager([]));
5554
$retry->markJobForRescheduling($jobA);
5655
$retry->markJobForRescheduling($jobB);
@@ -73,7 +72,7 @@ public function Rescheduling_a_job_only_increases_its_incarnation(): void
7372
'my-first-identifier'
7473
);
7574

76-
$retry = new Retry($this->scheduler);
75+
$retry = new SchedulingCoordinator($this->scheduler);
7776
$retry->injectQueueManager($this->queueManager([]));
7877
$retry->markJobForRescheduling($job);
7978
$retry->scheduleAll();
@@ -102,7 +101,7 @@ public function Expired_jobs_get_removed(): void
102101
$this->persistenceManager->add($job);
103102
$this->persistenceManager->persistAll();
104103

105-
$retry = new Retry($this->scheduler);
104+
$retry = new SchedulingCoordinator($this->scheduler);
106105
$retry->injectQueueManager($this->queueManager([
107106
'scheduledJobs' => [
108107
'backoffStrategy' => 'linear',
@@ -133,7 +132,7 @@ public function Expired_jobs_are_kept_if_the_queue_has_it_configured(): void
133132
$this->persistenceManager->add($job);
134133
$this->persistenceManager->persistAll();
135134

136-
$retry = new Retry($this->scheduler);
135+
$retry = new SchedulingCoordinator($this->scheduler);
137136
$retry->injectQueueManager($this->queueManager([
138137
'scheduledJobs' => [
139138
'backoffStrategy' => 'linear',

Tests/Functional/Retry/TestCase.php renamed to Tests/Functional/SchedulingCoordinator/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\Retry;
4+
namespace Netlogix\JobQueue\Scheduled\Tests\Functional\SchedulingCoordinator;
55

66
use DateInterval;
77
use DateTimeImmutable;

0 commit comments

Comments
 (0)