Skip to content
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

[6.x] Reset timeout handler after worker loop #31198

Merged
merged 2 commits into from
Jan 22, 2020
Merged

[6.x] Reset timeout handler after worker loop #31198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c65186c
reset timout handler after worker loop
themsaid Jan 22, 2020
08a1805
clean
themsaid Jan 22, 2020
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
12 changes: 12 additions & 0 deletions src/Illuminate/Queue/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ public function daemon($connectionName, $queue, WorkerOptions $options)
$this->sleep($options->sleep);
}

$this->resetTimeoutHandler();

// Finally, we will check to see if we have exceeded our memory limits or if
// the queue should restart based on other indications. If so, we'll stop
// this worker and let whatever is "monitoring" it restart the process.
Expand Down Expand Up @@ -170,6 +172,16 @@ protected function registerTimeoutHandler($job, WorkerOptions $options)
);
}

/**
* Reset the worker timeout handler.
*
* @return void
*/
protected function resetTimeoutHandler()
{
pcntl_alarm(0);
}

/**
* Get the appropriate timeout for the given job.
*
Expand Down