starred/newznab-tmux-NNTmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-28 22:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update concurrency handling

Browse Source
This commit is contained in:
DariusIII
2026-05-15 10:44:52 +02:00
parent 83c5624979
commit efa7b748cd
7 changed files with 15 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Providers/ConcurrencyServiceProvider.php
-31
View File
@@ -1,31 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Providers;
use App\Services\Concurrency\TimeoutAwareProcessDriver;
use Illuminate\Concurrency\ConcurrencyManager;
use Illuminate\Process\Factory as ProcessFactory;
use Illuminate\Support\ServiceProvider;
class ConcurrencyServiceProvider extends ServiceProvider
{
/**
* Register any application services.
*/
public function register(): void
{
$this->app->afterResolving(ConcurrencyManager::class, function (ConcurrencyManager $manager): void {
$manager->extend('process', function (): TimeoutAwareProcessDriver {
$configuredTimeout = config('nntmux.concurrency_timeout');
$timeout = (int) ($configuredTimeout ?? config('nntmux.multiprocessing_max_child_time', 1800));
return new TimeoutAwareProcessDriver(
app(ProcessFactory::class),
$timeout
);
});
});
}
}
app/Services/Concurrency/TimeoutAwareProcessDriver.php
-72
View File
@@ -1,72 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Services\Concurrency;
use Closure;
use Exception;
use Illuminate\Concurrency\ProcessDriver;
use Illuminate\Console\Application;
use Illuminate\Process\Factory as ProcessFactory;
use Illuminate\Process\Pool;
use Illuminate\Support\Arr;
use Laravel\SerializableClosure\SerializableClosure;
class TimeoutAwareProcessDriver extends ProcessDriver
{
public function __construct(
ProcessFactory $processFactory,
protected int $timeout
) {
parent::__construct($processFactory);
}
/**
* Run the given tasks concurrently and return an array containing the results.
*
* @throws \Throwable
*/
public function run(Closure|array $tasks): array
{
$command = Application::formatCommandString('invoke-serialized-closure');
$results = $this->processFactory->pool(function (Pool $pool) use ($tasks, $command) {
foreach (Arr::wrap($tasks) as $key => $task) {
$pool->as((string) $key)
->timeout($this->timeout)
->path(base_path())
->env([
'LARAVEL_INVOKABLE_CLOSURE' => base64_encode(
serialize(new SerializableClosure($task))
),
])
->command($command);
}
})->start()->wait();
return $results->collect()->mapWithKeys(function ($result, $key) {
if ($result->failed()) {
throw new Exception('Concurrent process failed with exit code ['.$result->exitCode().']. Message: '.$result->errorOutput());
}
$output = $result->output();
if (($pos = strpos($output, "\x1f\x8b")) !== false) {
$output = substr($output, 0, $pos);
}
$decodedResult = json_decode($output, true);
if (! $decodedResult['successful']) {
throw new $decodedResult['exception'](
...(! empty(array_filter($decodedResult['parameters']))
? $decodedResult['parameters']
: [$decodedResult['message']])
);
}
return [$key => unserialize($decodedResult['result'])];
})->all();
}
}
app/Services/Runners/BaseRunner.php
+10
View File
@@ -11,6 +11,16 @@ abstract class BaseRunner
{
public function __construct() {}
/**
* Resolve the configured timeout (seconds) for Laravel's Concurrency::run() calls.
*/
protected function concurrencyTimeout(): int
{
$configured = config('nntmux.concurrency_timeout');
return (int) ($configured ?? config('nntmux.multiprocessing_max_child_time', 1800));
}
protected function buildDnrCommand(string $args): string
{
// Convert legacy command arguments to new artisan commands
app/Services/Runners/PostProcessRunner.php
+2 -2
View File
@@ -71,7 +71,7 @@ class PostProcessRunner extends BaseRunner
}
try {
$results = Concurrency::run($tasks);
$results = Concurrency::run($tasks, $this->concurrencyTimeout());
foreach ($results as $taskIdx => $output) {
echo $output;
@@ -267,7 +267,7 @@ class PostProcessRunner extends BaseRunner
}
try {
$results = Concurrency::run($tasks);
$results = Concurrency::run($tasks, $this->concurrencyTimeout());
foreach ($results as $taskIdx => $output) {
echo $output;
app/Services/Runners/ReleasesRunner.php
+3 -3
View File
@@ -62,7 +62,7 @@ class ReleasesRunner extends BaseRunner
}
try {
$results = Concurrency::run($tasks);
$results = Concurrency::run($tasks, $this->concurrencyTimeout());
foreach ($results as $groupId => $output) {
echo $output;
@@ -111,7 +111,7 @@ class ReleasesRunner extends BaseRunner
}
try {
$results = Concurrency::run($tasks);
$results = Concurrency::run($tasks, $this->concurrencyTimeout());
foreach ($results as $groupId => $output) {
echo $output;
@@ -184,7 +184,7 @@ class ReleasesRunner extends BaseRunner
}
try {
$results = Concurrency::run($tasks);
$results = Concurrency::run($tasks, $this->concurrencyTimeout());
foreach ($results as $taskIdx => $output) {
echo $output;
bootstrap/providers.php
-2
View File
@@ -3,7 +3,6 @@
use App\Providers\AdditionalProcessingServiceProvider;
use App\Providers\AppServiceProvider;
use App\Providers\CategorizationServiceProvider;
use App\Providers\ConcurrencyServiceProvider;
use App\Providers\ForumServiceProvider;
use App\Providers\HorizonServiceProvider;
use App\Providers\ProcessingServiceProvider;
@@ -15,7 +14,6 @@ return [
AdditionalProcessingServiceProvider::class,
AppServiceProvider::class,
CategorizationServiceProvider::class,
ConcurrencyServiceProvider::class,
ForumServiceProvider::class,
HorizonServiceProvider::class,
ProcessingServiceProvider::class,
phpstan-baseline.neon
-11
View File
@@ -786,17 +786,6 @@ parameters:
count: 1
path: app/Services/Categorization/CategorizationService.php
-
message: '#^Method App\\Services\\Concurrency\\TimeoutAwareProcessDriver\:\:run\(\) has parameter \$tasks with no value type specified in iterable type array\.$#'
identifier: missingType.iterableValue
count: 1
path: app/Services/Concurrency/TimeoutAwareProcessDriver.php
-
message: '#^Method App\\Services\\Concurrency\\TimeoutAwareProcessDriver\:\:run\(\) return type has no value type specified in iterable type array\.$#'
identifier: missingType.iterableValue
count: 1
path: app/Services/Concurrency/TimeoutAwareProcessDriver.php
-
message: '#^Strict comparison using \!\=\= between non\-empty\-array\<mixed, mixed\> and array\{\} will always evaluate to true\.$#'