Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

feat(scheduler): add pagination to skipped jobs and filter manager start events

Andras Bacsai63be5928ab10
diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index f2f454f87b..5fc9f6cd87 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -478,7 +478,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
throw new \Exception('MongoDB credentials not found. Ensure MONGO_INITDB_ROOT_USERNAME and MONGO_INITDB_ROOT_PASSWORD environment variables are available in the container.');
}
}
- \Log::info('MongoDB backup URL configured', ['has_url' => filled($url), 'using_env_vars' => blank($this->database->internal_db_url)]);
+ Log::info('MongoDB backup URL configured', ['has_url' => filled($url), 'using_env_vars' => blank($this->database->internal_db_url)]);
if ($databaseWithCollections === 'all') {
$commands[] = 'mkdir -p '.$this->backup_dir;
if (str($this->database->image)->startsWith('mongo:4')) {
diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php
index f3f3a2ae4d..78ef7f3a22 100644
--- a/app/Jobs/DockerCleanupJob.php
+++ b/app/Jobs/DockerCleanupJob.php
@@ -91,6 +91,8 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
$this->server->team?->notify(new DockerCleanupSuccess($this->server, $message));
event(new DockerCleanupDone($this->execution_log));
+
+ return;
}
if ($this->usageBefore >= $this->server->settings->docker_cleanup_threshold) {
diff --git a/app/Jobs/ScheduledTaskJob.php b/app/Jobs/ScheduledTaskJob.php
index b21bc11a1a..49b9b97027 100644
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -14,13 +14,14 @@ use App\Notifications\ScheduledTask\TaskFailed;
use App\Notifications\ScheduledTask\TaskSuccess;
use Carbon\Carbon;
use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
-class ScheduledTaskJob implements ShouldQueue
+class ScheduledTaskJob implements ShouldBeEncrypted, ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
diff --git a/app/Livewire/Settings/ScheduledJobs.php b/app/Livewire/Settings/ScheduledJobs.php
index 66480cd8d7..4947dd19b2 100644
--- a/app/Livewire/Settings/ScheduledJobs.php
+++ b/app/Livewire/Settings/ScheduledJobs.php
@@ -16,6 +16,18 @@ class ScheduledJobs extends Component
public string $filterDate = 'last_24h';
+ public int $skipPage = 0;
+
+ public int $skipDefaultTake = 20;
+
+ public bool $showSkipNext = false;
+
+ public bool $showSkipPrev = false;
+
+ public int $skipCurrentPage = 1;
+
+ public int $skipTotalCount = 0;
+
protected Collection $executions;
protected Collection $skipLogs;
@@ -42,11 +54,30 @@ class ScheduledJobs extends Component
public function updatedFilterType(): void
{
+ $this->skipPage = 0;
$this->loadData();
}
public function updatedFilterDate(): void
{
+ $this->skipPage = 0;
+ $this->loadData();
+ }
+
+ public function skipNextPage(): void
+ {
+ $this->skipPage += $this->skipDefaultTake;
+ $this->showSkipPrev = true;
+ $this->loadData();
+ }
+
+ public function skipPreviousPage(): void
+ {
+ $this->skipPage -= $this->skipDefaultTake;
+ if ($this->skipPage < 0) {
+ $this->skipPage = 0;
+ }
+ $this->showSkipPrev = $this->skipPage > 0;
$this->loadData();
}
@@ -69,7 +100,12 @@ class ScheduledJobs extends Component
$this->executions = $this->getExecutions($teamId);
$parser = new SchedulerLogParser;
- $this->skipLogs = $parser->getRecentSkips(50, $teamId);
+ $allSkips = $parser->getRecentSkips(500, $teamId);
+ $this->skipTotalCount = $allSkips->count();
+ $this->skipLogs = $allSkips->slice($this->skipPage, $this->skipDefaultTake)->values();
+ $this->showSkipPrev = $this->skipPage > 0;
+ $this->showSkipNext = ($this->skipPage + $this->skipDefaultTake) < $this->skipTotalCount;
+ $this->skipCurrentPage = intval($this->skipPage / $this->skipDefaultTake) + 1;
$this->managerRuns = $parser->getRecentRuns(30, $teamId);
}
diff --git a/app/Services/SchedulerLogParser.php b/app/Services/SchedulerLogParser.php
index a735a11c39..6e29851dfc 100644
--- a/app/Services/SchedulerLogParser.php
+++ b/app/Services/SchedulerLogParser.php
@@ -64,7 +64,7 @@ class SchedulerLogParser
continue;
}
- if (! str_contains($entry['message'], 'ScheduledJobManager')) {
+ if (! str_contains($entry['message'], 'ScheduledJobManager') || str_contains($entry['message'], 'started')) {
continue;
}
diff --git a/resources/views/livewire/settings/scheduled-jobs.blade.php b/resources/views/livewire/settings/scheduled-jobs.blade.php
index d22aca9114..60acc90629 100644
--- a/resources/views/livewire/settings/scheduled-jobs.blade.php
+++ b/resources/views/livewire/settings/scheduled-jobs.blade.php
@@ -34,7 +34,7 @@
])
:class="activeTab === 'skipped-jobs' && 'dark:bg-coollabs bg-coollabs text-white'"
@click="activeTab = 'skipped-jobs'; window.location.hash = 'skipped-jobs'">
- Skipped Jobs ({{ $skipLogs->count() }})
+ Skipped Jobs ({{ $skipTotalCount }})
</div>
</div>
@@ -186,6 +186,27 @@
{{-- Skipped Jobs Tab --}}
<div x-show="activeTab === 'skipped-jobs'" x-cloak>
<div class="pb-4 text-sm text-gray-500">Jobs that were not dispatched because conditions were not met.</div>
+ @if($skipTotalCount > $skipDefaultTake)
+ <div class="flex items-center gap-2 mb-4">
+ <x-forms.button disabled="{{ !$showSkipPrev }}" wire:click="skipPreviousPage">
+ <svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+ stroke="currentColor">
+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+ d="M15 19l-7-7 7-7" />
+ </svg>
+ </x-forms.button>
+ <span class="text-sm">
+ Page {{ $skipCurrentPage }} of {{ ceil($skipTotalCount / $skipDefaultTake) }}
+ </span>
+ <x-forms.button disabled="{{ !$showSkipNext }}" wire:click="skipNextPage">
+ <svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+ stroke="currentColor">
+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+ d="M9 5l7 7-7 7" />
+ </svg>
+ </x-forms.button>
+ </div>
+ @endif
<div class="overflow-x-auto">
<table class="w-full text-sm text-left">
<thead class="text-xs uppercase bg-gray-50 dark:bg-coolgray-200">
diff --git a/tests/Feature/ScheduledJobMonitoringTest.php b/tests/Feature/ScheduledJobMonitoringTest.php
index 1348375d45..90a3f57a4a 100644
--- a/tests/Feature/ScheduledJobMonitoringTest.php
+++ b/tests/Feature/ScheduledJobMonitoringTest.php
@@ -173,6 +173,42 @@ test('scheduler log parser parses skip entries correctly', function () {
@unlink($logPath);
});
+test('scheduler log parser excludes started events from runs', function () {
+ $logPath = storage_path('logs/scheduled-test-started-filter.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;
+ }
+
+ $logPath = storage_path('logs/scheduled-'.now()->format('Y-m-d').'.log');
+ $lines = [
+ '['.now()->format('Y-m-d H:i:s').'] production.INFO: ScheduledJobManager started {}',
+ '['.now()->format('Y-m-d H:i:s').'] production.INFO: ScheduledJobManager completed {"duration_ms":74,"dispatched":1,"skipped":13}',
+ ];
+ file_put_contents($logPath, implode("\n", $lines)."\n");
+
+ $parser = new SchedulerLogParser;
+ $runs = $parser->getRecentRuns();
+
+ expect($runs)->toHaveCount(1);
+ expect($runs->first()['message'])->toContain('completed');
+
+ // Cleanup
+ @unlink($logPath);
+ foreach ($renamed as $tmp => $original) {
+ rename($tmp, $original);
+ }
+});
+
test('scheduler log parser filters by team id', function () {
$logPath = storage_path('logs/scheduled-'.now()->format('Y-m-d').'.log');
$logDir = dirname($logPath);