Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1482353

Browse files
Merge pull request #36 from michalsn/connection-name
fix: `connection` name for used handler
2 parents 706ca99 + 11e9a37 commit 1482353

File tree

6 files changed

+31
-5
lines changed

6 files changed

+31
-5
lines changed

‎src/Handlers/BaseHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ abstract class BaseHandler
3030
protected QueueConfig $config;
3131
protected ?string $priority = null;
3232

33+
abstract public function name(): string;
34+
3335
abstract public function push(string $queue, string $job, array $data): bool;
3436

3537
abstract public function pop(string $queue, array $priorities): ?QueueJob;
@@ -144,7 +146,7 @@ protected function logFailed(QueueJob $queueJob, Throwable $err): bool
144146
"file: {$err->getFile()}:{$err->getLine()}";
145147

146148
$queueJobFailed = new QueueJobFailed([
147-
'connection' => 'database',
149+
'connection' => $this->name(),
148150
'queue' => $queueJob->queue,
149151
'payload' => $queueJob->payload,
150152
'priority' => $queueJob->priority,

‎src/Handlers/DatabaseHandler.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ public function __construct(protected QueueConfig $config)
3333
$this->jobModel = model(QueueJobModel::class, true, $connection);
3434
}
3535

36+
/**
37+
* Name of the handler.
38+
*/
39+
public function name(): string
40+
{
41+
return 'database';
42+
}
43+
3644
/**
3745
* Add job to the queue.
3846
*

‎src/Handlers/PredisHandler.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ public function __construct(protected QueueConfig $config)
3838
}
3939
}
4040

41+
/**
42+
* Name of the handler.
43+
*/
44+
public function name(): string
45+
{
46+
return 'predis';
47+
}
48+
4149
/**
4250
* Add job to the queue.
4351
*/

‎src/Handlers/RedisHandler.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ public function __construct(protected QueueConfig $config)
5353
}
5454
}
5555

56+
/**
57+
* Name of the handler.
58+
*/
59+
public function name(): string
60+
{
61+
return 'redis';
62+
}
63+
5664
/**
5765
* Add job to the queue.
5866
*

‎tests/PredisHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function testFailedAndKeepJob(): void
182182

183183
$this->seeInDatabase('queue_jobs_failed', [
184184
'id' => 2,
185-
'connection' => 'database',
185+
'connection' => 'predis',
186186
'queue' => 'queue1',
187187
]);
188188
}
@@ -206,7 +206,7 @@ public function testFailedAndDontKeepJob(): void
206206

207207
$this->dontSeeInDatabase('queue_jobs_failed', [
208208
'id' => 2,
209-
'connection' => 'database',
209+
'connection' => 'predis',
210210
'queue' => 'queue1',
211211
]);
212212
}

‎tests/RedisHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function testFailedAndKeepJob(): void
166166

167167
$this->seeInDatabase('queue_jobs_failed', [
168168
'id' => 2,
169-
'connection' => 'database',
169+
'connection' => 'redis',
170170
'queue' => 'queue1',
171171
]);
172172
}
@@ -187,7 +187,7 @@ public function testFailedAndDontKeepJob(): void
187187

188188
$this->dontSeeInDatabase('queue_jobs_failed', [
189189
'id' => 2,
190-
'connection' => 'database',
190+
'connection' => 'redis',
191191
'queue' => 'queue1',
192192
]);
193193
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /