Skip to content

[BUGFIX] Respect changed stopIfNecessary() signature #34

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

Open
sbuerk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[BUGFIX] Respect changed stopIfNecessary() signature #34

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: 10 additions & 1 deletion src/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ class Worker extends \Illuminate\Queue\Worker implements

protected $extensions = [];

protected $processed = 0;

protected $startTime = 0;

public function daemon($connectionName, $queueNames, WorkerOptions $options)
{
$this->connectionName = $connectionName;
Expand All @@ -56,13 +60,15 @@ public function daemon($connectionName, $queueNames, WorkerOptions $options)
parent::daemon($connectionName, $this->queueNames, $options);
return;
}
$this->startTime = hrtime(true);

$context = $this->queue->getQueueInteropContext();
$queueConsumer = new QueueConsumer($context, new ChainExtension(
$this->getAllExtensions([$this])
));
foreach (explode(',', $queueNames) as $queueName) {
$queueConsumer->bindCallback($queueName, function() {
$this->processed++;
$this->runJob($this->job, $this->connectionName, $this->options);

return Result::ALREADY_ACKNOWLEDGED;
Expand All @@ -87,6 +93,8 @@ public function runNextJob($connectionName, $queueNames, WorkerOptions $options)
return;
}

$this->startTime = hrtime(true);

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

$queueConsumer = new QueueConsumer($context, new ChainExtension($this->getAllExtensions([
Expand All @@ -96,6 +104,7 @@ public function runNextJob($connectionName, $queueNames, WorkerOptions $options)

foreach (explode(',', $queueNames) as $queueName) {
$queueConsumer->bindCallback($queueName, function() {
$this->processed++;
$this->runJob($this->job, $this->connectionName, $this->options);

return Result::ALREADY_ACKNOWLEDGED;
Expand Down Expand Up @@ -143,7 +152,7 @@ public function onMessageReceived(MessageReceived $context): void

public function onPostMessageReceived(PostMessageReceived $context): void
{
$this->stopIfNecessary($this->options, $this->lastRestart, $this->job);
$this->stopIfNecessary($this->options, $this->lastRestart, $this->startTime, $this->processed, $this->job);

if ($this->stopped) {
$context->interruptExecution();
Expand Down