diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Messenger] fix review

Browse Source
This commit is contained in:
Nicolas Grekas 2019-03-31 19:00:04 +02:00
parent 343d28e3d1
commit a3de9020c8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Messenger/Command/StopWorkersCommand.php
View File

@ -65,7 +65,7 @@ EOF
$io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
$cacheItem = $this->restartSignalCachePool->getItem(StopWhenRestartSignalIsReceived::RESTART_REQUESTED_TIMESTAMP_KEY);
$cacheItem->set(time());
$cacheItem->set(microtime(true));
$this->restartSignalCachePool->save($cacheItem);
$io->success('Signal successfully sent to stop any running workers.');

9
src/Symfony/Component/Messenger/Worker/StopWhenRestartSignalIsReceived.php
View File

@ -38,14 +38,14 @@ class StopWhenRestartSignalIsReceived implements WorkerInterface
public function run(array $options = [], callable $onHandledCallback = null): void
{
$workerStartedTimestamp = time();
$workerStartedAt = microtime(true);
$this->decoratedWorker->run($options, function (?Envelope $envelope) use ($onHandledCallback, $workerStartedTimestamp) {
$this->decoratedWorker->run($options, function (?Envelope $envelope) use ($onHandledCallback, $workerStartedAt) {
if (null !== $onHandledCallback) {
$onHandledCallback($envelope);
}
if ($this->shouldRestart($workerStartedTimestamp)) {
if ($this->shouldRestart($workerStartedAt)) {
$this->stop();
if (null !== $this->logger) {
$this->logger->info('Worker stopped because a restart was requested.');
@ -59,9 +59,10 @@ class StopWhenRestartSignalIsReceived implements WorkerInterface
$this->decoratedWorker->stop();
}
private function shouldRestart(int $workerStartedAt)
private function shouldRestart(float $workerStartedAt)
{
$cacheItem = $this->cachePool->getItem(self::RESTART_REQUESTED_TIMESTAMP_KEY);
if (!$cacheItem->isHit()) {
// no restart has ever been scheduled
return false;