Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
27 changed files
with
558 additions
and
120 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Contao\CoreBundle\Cron; | ||
|
|
||
| use Symfony\Component\Process\PhpExecutableFinder; | ||
| use Symfony\Component\Process\Process; | ||
|
|
||
| abstract class AbstractConsoleCron | ||
| { | ||
| private string|null $phpBinary = null; | ||
|
|
||
| public function __construct(private string $consolePath) | ||
| { | ||
| } | ||
|
|
||
| protected function createProcess(string $command, string ...$commandArguments): Process | ||
| { | ||
| $arguments = []; | ||
| $arguments[] = $this->getPhpBinary(); | ||
| $arguments[] = $this->consolePath; | ||
| $arguments = array_merge($arguments, $this->getPhpArguments()); | ||
| $arguments[] = $command; | ||
| $arguments = array_merge($arguments, $commandArguments); | ||
|
|
||
| return new Process($arguments); | ||
| } | ||
|
|
||
| protected function getPhpArguments(): array | ||
| { | ||
| return []; | ||
| } | ||
|
|
||
| private function getPhpBinary(): string | ||
| { | ||
| if (null === $this->phpBinary) { | ||
| $executableFinder = new PhpExecutableFinder(); | ||
| $this->phpBinary = $executableFinder->find(); | ||
| } | ||
|
|
||
| return $this->phpBinary; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /* | ||
| * This file is part of Contao. | ||
| * | ||
| * (c) Leo Feyer | ||
| * | ||
| * @license LGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace Contao\CoreBundle\Cron; | ||
|
|
||
| use Contao\CoreBundle\DependencyInjection\Attribute\AsCronJob; | ||
|
|
||
| #[AsCronJob('minutely')] | ||
| class MessengerCron extends AbstractConsoleCron | ||
| { | ||
| public function __construct(string $consolePath, private int $numberOfWorkers = 0) | ||
| { | ||
| parent::__construct($consolePath); | ||
| } | ||
|
|
||
| public function __invoke(string $scope): void | ||
| { | ||
| if (Cron::SCOPE_WEB === $scope || $this->numberOfWorkers < 1) { | ||
| return; | ||
| } | ||
|
|
||
| $processes = []; | ||
|
|
||
| for ($i = 0; $i < $this->numberOfWorkers; ++$i) { | ||
| $process = $this->createProcess( | ||
| 'messenger:consume', | ||
| '--time-limit=60', // Minutely cronjob running for one minute max | ||
| 'contao_prio_high', | ||
| 'contao_prio_normal', | ||
| 'contao_prio_low' | ||
| ); | ||
| $process->setTimeout(65); | ||
|
|
||
| // Start the job asynchronously | ||
| $process->start(); | ||
| $processes[] = $process; | ||
| } | ||
|
|
||
| // Now we need to sleep to keep the parent process open. Otherwise, this script will end and thus kill | ||
| // our child processes. | ||
| // All jobs run for 60 seconds, so we don't need to check every second yet | ||
| sleep(55); | ||
|
|
||
| // Now we check every second if all processes are done | ||
| while (true) { | ||
| $allDone = true; | ||
|
|
||
| foreach ($processes as $process) { | ||
| if ($process->isRunning()) { | ||
| $allDone = false; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if ($allDone) { | ||
| break; | ||
| } | ||
|
|
||
| sleep(1); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.