Hintergrundaufgaben: Pseudo-Cron nur nach Seitenaufrufen, Queue im selben Prozess (0.28.2)
Some checks failed
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 6m55s
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 7m6s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 6m26s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 6m13s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 9m12s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 8m41s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 6m19s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 6m29s
CI / Build-Artefakte aktuell (pull_request) Successful in 1m33s
Some checks failed
CI / PHP 8.3 / mariadb:10.6 (pull_request) Successful in 6m55s
CI / PHP 8.4 / mariadb:10.6 (pull_request) Successful in 7m6s
CI / PHP 8.3 / mariadb:11.4 (pull_request) Successful in 6m26s
CI / PHP 8.4 / mariadb:11.4 (pull_request) Successful in 6m13s
CI / PHP 8.3 / mysql:8.0 (pull_request) Failing after 9m12s
CI / PHP 8.4 / mysql:8.0 (pull_request) Failing after 8m41s
CI / PHP 8.3 / mysql:8.4 (pull_request) Failing after 6m19s
CI / PHP 8.4 / mysql:8.4 (pull_request) Failing after 6m29s
CI / Build-Artefakte aktuell (pull_request) Successful in 1m33s
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
c6e2dd91f5
commit
987bf7c8f8
6 changed files with 54 additions and 5 deletions
|
|
@ -4,6 +4,11 @@ Neueste Version oben. Jeder Abschnitt beginnt mit `## MAJOR.MINOR.PATCH` und
|
|||
enthält kurze Stichpunkte für Anwenderinnen und Anwender – keine Commit-Texte.
|
||||
Der Self-Updater zeigt diese Abschnitte bei neuen Versionen an.
|
||||
|
||||
## 0.28.2
|
||||
|
||||
- Behoben: Sporadisch „Fehler beim Laden der Seite“ im Backend (z. B. beim Speichern des Menüs). Ohne eingerichteten Cronjob liefen Hintergrundaufgaben auch im Anschluss an Speichern-Aktionen – auf manchen Servern musste die Aktion darauf warten. Sie laufen jetzt nur noch nach normalen Seitenaufrufen
|
||||
- Behoben: Die Warteschlange (Push-Nachrichten, E-Mails) brach auf manchen Servern jede Minute mit „exit code 255“ ab, weil ein anderes PHP gestartet wurde. Sie wird jetzt im selben PHP-Prozess abgearbeitet
|
||||
|
||||
## 0.28.1
|
||||
|
||||
- Stellenausschreibungen und Termine: Bilder in der Beschreibung – hochladen oder aus der Mediathek wählen
|
||||
|
|
|
|||
|
|
@ -24,10 +24,29 @@ class RunPseudoCron
|
|||
|
||||
public function terminate(Request $request, Response $response): void
|
||||
{
|
||||
if (app()->runningUnitTests() || ! Installation::isInstalled() || ! $this->tasks->pseudoCronDue()) {
|
||||
if (app()->runningUnitTests() || ! Installation::isInstalled() || ! self::suitable($request) || ! $this->tasks->pseudoCronDue()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Antwort vorher vollständig ausliefern, wo der Server das kann
|
||||
if (function_exists('fastcgi_finish_request')) {
|
||||
fastcgi_finish_request();
|
||||
} elseif (function_exists('litespeed_finish_request')) {
|
||||
litespeed_finish_request();
|
||||
}
|
||||
|
||||
$this->tasks->run('pseudo');
|
||||
}
|
||||
|
||||
/**
|
||||
* Nur nach normalen Seitenaufrufen – nie bei Speichern-Aktionen oder Livewire-/Inertia-Anfragen
|
||||
* im Hintergrund: Kann der Server die Antwort nicht vorab ausliefern, würden diese sonst warten.
|
||||
*/
|
||||
public static function suitable(Request $request): bool
|
||||
{
|
||||
return $request->isMethod('GET')
|
||||
&& ! $request->hasHeader('X-Livewire')
|
||||
&& ! $request->hasHeader('X-Inertia')
|
||||
&& ! $request->expectsJson();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ namespace App;
|
|||
*/
|
||||
final class Version
|
||||
{
|
||||
public const VERSION = '0.28.1';
|
||||
public const VERSION = '0.28.2';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,13 @@ Schedule::call(fn () => app(EntraDirectorySync::class)->runAll())
|
|||
->withoutOverlapping(30);
|
||||
|
||||
// Aufträge der Datenbank-Queue in kurzen Häppchen abarbeiten (kein Dauerprozess nötig).
|
||||
Schedule::command('queue:work --stop-when-empty --max-time=40 --tries=3')
|
||||
// Im selben PHP-Prozess – ein eigener Aufruf von „php“ trifft auf manchen Servern eine andere
|
||||
// PHP-Version (Abbruch mit Code 255). Beim Pseudo-Cron kürzer, damit kein Seitenaufruf lange wartet.
|
||||
Schedule::call(fn () => Artisan::call('queue:work', [
|
||||
'--stop-when-empty' => true,
|
||||
'--max-time' => app()->runningInConsole() ? 45 : 15,
|
||||
'--tries' => 3,
|
||||
]))
|
||||
->everyMinute()
|
||||
->name('queue')
|
||||
->withoutOverlapping(5);
|
||||
|
|
|
|||
|
|
@ -2,8 +2,12 @@
|
|||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Http\Middleware\RunPseudoCron;
|
||||
use App\Support\BackgroundTasks;
|
||||
use Illuminate\Console\Scheduling\CallbackEvent;
|
||||
use Illuminate\Console\Scheduling\Schedule;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Illuminate\Http\Request;
|
||||
use Tests\TestCase;
|
||||
|
||||
class BackgroundTasksTest extends TestCase
|
||||
|
|
@ -50,4 +54,19 @@ class BackgroundTasksTest extends TestCase
|
|||
$tasks->heartbeat('pseudo');
|
||||
$this->assertFalse($tasks->pseudoCronDue(), 'Höchstens einmal pro Minute.');
|
||||
}
|
||||
|
||||
public function test_pseudo_cron_never_runs_during_saving_or_background_requests(): void
|
||||
{
|
||||
$this->assertTrue(RunPseudoCron::suitable(Request::create('/')));
|
||||
$this->assertFalse(RunPseudoCron::suitable(Request::create('/livewire/update', 'POST')));
|
||||
$this->assertFalse(RunPseudoCron::suitable(Request::create('/admin/menue', 'GET', server: ['HTTP_X_LIVEWIRE' => '1'])));
|
||||
$this->assertFalse(RunPseudoCron::suitable(Request::create('/neuigkeiten', 'GET', server: ['HTTP_X_INERTIA' => 'true'])));
|
||||
}
|
||||
|
||||
public function test_queue_is_worked_in_process_not_via_an_external_php_binary(): void
|
||||
{
|
||||
$event = collect(app(Schedule::class)->events())->first(fn ($e) => $e->description === 'queue');
|
||||
|
||||
$this->assertInstanceOf(CallbackEvent::class, $event);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
4
vendor/composer/installed.php
vendored
4
vendor/composer/installed.php
vendored
|
|
@ -3,7 +3,7 @@
|
|||
'name' => 'inhaus/inhaus',
|
||||
'pretty_version' => 'dev-main',
|
||||
'version' => 'dev-main',
|
||||
'reference' => 'c0595d42dd2a3bb200ddaffafb0b45512303a636',
|
||||
'reference' => 'c6e2dd91f5e71b4e0a02d9bc76570be244c60d2f',
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
|
|
@ -550,7 +550,7 @@
|
|||
'inhaus/inhaus' => array(
|
||||
'pretty_version' => 'dev-main',
|
||||
'version' => 'dev-main',
|
||||
'reference' => 'c0595d42dd2a3bb200ddaffafb0b45512303a636',
|
||||
'reference' => 'c6e2dd91f5e71b4e0a02d9bc76570be244c60d2f',
|
||||
'type' => 'project',
|
||||
'install_path' => __DIR__ . '/../../',
|
||||
'aliases' => array(),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue