Skip to content

Add extensions support #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2022
Merged

Add extensions support #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/EnqueueServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@

class EnqueueServiceProvider extends ServiceProvider
{
/**
* @var array
*/
protected $extensions = [];

public function boot()
{
$this->bootInteropQueueDriver();
Expand All @@ -36,7 +41,7 @@ private function registerClient()
$this->app->singleton(SimpleClient::class, function() {
/** @var \Illuminate\Config\Repository $config */
$config = $this->app['config'];

return new SimpleClient($config->get('enqueue.client'));
});

Expand Down Expand Up @@ -64,14 +69,14 @@ private function bootInteropQueueDriver()
});

$this->app->extend('queue.worker', function ($worker, $app) {
return new Worker(
return (new Worker(
$app['queue'],
$app['events'],
$app[ExceptionHandler::class],
function () use ($app) {
return $app->isDownForMaintenance();
}
);
))->setExtensions($this->extensions);
});
}
}
27 changes: 23 additions & 4 deletions src/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class Worker extends \Illuminate\Queue\Worker implements

protected $job;

protected $extensions = [];

public function daemon($connectionName, $queueNames, WorkerOptions $options)
{
$this->connectionName = $connectionName;
Expand All @@ -56,7 +58,9 @@ public function daemon($connectionName, $queueNames, WorkerOptions $options)
}

$context = $this->queue->getQueueInteropContext();
$queueConsumer = new QueueConsumer($context, new ChainExtension([$this]));
$queueConsumer = new QueueConsumer($context, new ChainExtension(
$this->getAllExtensions([$this])
));
foreach (explode(',', $queueNames) as $queueName) {
$queueConsumer->bindCallback($queueName, function() {
$this->runJob($this->job, $this->connectionName, $this->options);
Expand Down Expand Up @@ -85,10 +89,10 @@ public function runNextJob($connectionName, $queueNames, WorkerOptions $options)

$context = $this->queue->getQueueInteropContext();

$queueConsumer = new QueueConsumer($context, new ChainExtension([
$queueConsumer = new QueueConsumer($context, new ChainExtension($this->getAllExtensions([
$this,
new LimitConsumedMessagesExtension(1),
]));
])));

foreach (explode(',', $queueNames) as $queueName) {
$queueConsumer->bindCallback($queueName, function() {
Expand Down Expand Up @@ -163,5 +167,20 @@ public function stop($status = 0)

parent::stop($status);
}
}

public function setExtensions(array $extensions): self
{
$this->extensions = $extensions;

return $this;
}

protected function getAllExtensions(array $array): array
{
foreach ($this->extensions as $extension) {
$array[] = $extension;
}

return $array;
}
}