@@ -235,6 +235,17 @@
{{ ucfirst(str_replace('_', ' ', $skip['type'])) }}
+ |
+ @if($skip['link'] ?? null)
+
+ {{ $skip['resource_name'] }}
+
+ @elseif($skip['resource_name'] ?? null)
+ {{ $skip['resource_name'] }}
+ @else
+ {{ $skip['context']['task_name'] ?? $skip['context']['server_name'] ?? 'Deleted' }}
+ @endif
+ |
@php
$reasonLabel = match($skip['reason']) {
@@ -256,15 +267,6 @@
@endphp
{{ $reasonLabel }}
|
-
- @php
- $details = collect($skip['context'])
- ->except(['type', 'skip_reason', 'execution_time'])
- ->map(fn($v, $k) => str_replace('_', ' ', $k) . ': ' . $v)
- ->implode(', ');
- @endphp
- {{ $details }}
- |
@empty
diff --git a/tests/Feature/ScheduledJobManagerShouldRunNowTest.php b/tests/Feature/ScheduledJobManagerShouldRunNowTest.php
index 8862cc71e..f820c3777 100644
--- a/tests/Feature/ScheduledJobManagerShouldRunNowTest.php
+++ b/tests/Feature/ScheduledJobManagerShouldRunNowTest.php
@@ -30,8 +30,11 @@ it('dispatches backup when job runs on time at the cron minute', function () {
expect($result)->toBeTrue();
});
-it('dispatches backup when job is delayed past the cron minute', function () {
- // Freeze time at 02:07 — job was delayed 7 minutes past the 02:00 cron
+it('catches delayed job when cache has a baseline from previous run', function () {
+ // Simulate a previous dispatch yesterday at 02:00
+ Cache::put('test-backup:1', Carbon::create(2026, 2, 27, 2, 0, 0, 'UTC')->toIso8601String(), 86400);
+
+ // Freeze time at 02:07 — job was delayed 7 minutes past today's 02:00 cron
Carbon::setTestNow(Carbon::create(2026, 2, 28, 2, 7, 0, 'UTC'));
$job = new ScheduledJobManager;
@@ -45,8 +48,8 @@ it('dispatches backup when job is delayed past the cron minute', function () {
$method = $reflection->getMethod('shouldRunNow');
$method->setAccessible(true);
- // isDue() would return false at 02:07, but getPreviousRunDate() = 02:00
- // No lastDispatched in cache → should run
+ // isDue() would return false at 02:07, but getPreviousRunDate() = 02:00 today
+ // lastDispatched = 02:00 yesterday → 02:00 today > yesterday → fires
$result = $method->invoke($job, '0 2 * * *', 'UTC', 'test-backup:1');
expect($result)->toBeTrue();
@@ -106,8 +109,27 @@ it('fires every_minute cron correctly on consecutive minutes', function () {
expect($result3)->toBeTrue();
});
-it('re-dispatches after cache loss instead of missing', function () {
- // First run at 02:00 — dispatches
+it('does not fire non-due jobs on restart when cache is empty', function () {
+ // Time is 10:00, cron is daily at 02:00 — NOT due right now
+ Carbon::setTestNow(Carbon::create(2026, 2, 28, 10, 0, 0, 'UTC'));
+
+ $job = new ScheduledJobManager;
+ $reflection = new ReflectionClass($job);
+
+ $executionTimeProp = $reflection->getProperty('executionTime');
+ $executionTimeProp->setAccessible(true);
+ $executionTimeProp->setValue($job, Carbon::now());
+
+ $method = $reflection->getMethod('shouldRunNow');
+ $method->setAccessible(true);
+
+ // Cache is empty (fresh restart) — should NOT fire daily backup at 10:00
+ $result = $method->invoke($job, '0 2 * * *', 'UTC', 'test-backup:4');
+ expect($result)->toBeFalse();
+});
+
+it('fires due jobs on restart when cache is empty', function () {
+ // Time is exactly 02:00, cron is daily at 02:00 — IS due right now
Carbon::setTestNow(Carbon::create(2026, 2, 28, 2, 0, 0, 'UTC'));
$job = new ScheduledJobManager;
@@ -120,16 +142,8 @@ it('re-dispatches after cache loss instead of missing', function () {
$method = $reflection->getMethod('shouldRunNow');
$method->setAccessible(true);
- $method->invoke($job, '0 2 * * *', 'UTC', 'test-backup:4');
-
- // Simulate Redis restart — cache lost
- Cache::forget('test-backup:4');
-
- // Run again at 02:01 — should re-dispatch (lastDispatched = null after cache loss)
- Carbon::setTestNow(Carbon::create(2026, 2, 28, 2, 1, 0, 'UTC'));
- $executionTimeProp->setValue($job, Carbon::now());
-
- $result = $method->invoke($job, '0 2 * * *', 'UTC', 'test-backup:4');
+ // Cache is empty (fresh restart) — but cron IS due → should fire
+ $result = $method->invoke($job, '0 2 * * *', 'UTC', 'test-backup:4b');
expect($result)->toBeTrue();
});
diff --git a/tests/Feature/ScheduledJobMonitoringTest.php b/tests/Feature/ScheduledJobMonitoringTest.php
index 90a3f57a4..036c3b638 100644
--- a/tests/Feature/ScheduledJobMonitoringTest.php
+++ b/tests/Feature/ScheduledJobMonitoringTest.php
@@ -234,3 +234,39 @@ test('scheduler log parser filters by team id', function () {
// Cleanup
@unlink($logPath);
});
+
+test('skipped jobs show fallback when resource is deleted', function () {
+ $this->actingAs($this->rootUser);
+ session(['currentTeam' => $this->rootTeam]);
+
+ $logPath = storage_path('logs/scheduled-'.now()->format('Y-m-d').'.log');
+ $logDir = dirname($logPath);
+ if (! is_dir($logDir)) {
+ mkdir($logDir, 0755, true);
+ }
+
+ // Temporarily rename existing logs so they don't interfere
+ $existingLogs = glob(storage_path('logs/scheduled-*.log'));
+ $renamed = [];
+ foreach ($existingLogs as $log) {
+ $tmp = $log.'.bak';
+ rename($log, $tmp);
+ $renamed[$tmp] = $log;
+ }
+
+ $lines = [
+ '['.now()->format('Y-m-d H:i:s').'] production.INFO: Task skipped {"type":"task","skip_reason":"application_not_running","task_id":99999,"task_name":"my-cron-job","team_id":0}',
+ ];
+ file_put_contents($logPath, implode("\n", $lines)."\n");
+
+ Livewire::test(ScheduledJobs::class)
+ ->assertStatus(200)
+ ->assertSee('my-cron-job')
+ ->assertSee('Application not running');
+
+ // Cleanup
+ @unlink($logPath);
+ foreach ($renamed as $tmp => $original) {
+ rename($tmp, $original);
+ }
+});