diff --git a/tests/Feature/ScheduledJobMonitoringTest.php b/tests/Feature/ScheduledJobMonitoringTest.php
index 1348375d4..90a3f57a4 100644
--- a/tests/Feature/ScheduledJobMonitoringTest.php
+++ b/tests/Feature/ScheduledJobMonitoringTest.php
@@ -173,6 +173,42 @@
@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);
From 31555f9e8a3a589e309eefc6a9267da66ecfe12a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sat, 28 Feb 2026 18:03:29 +0100
Subject: [PATCH 6/7] fix(jobs): prevent non-due jobs firing on restart and
enrich skip logs with resource links
- Refactor shouldRunNow() to only fire on first run (empty cache) if actually due by cron schedule, preventing spurious executions after cache loss or service restart
- Add enrichSkipLogsWithLinks() method to fetch and populate resource names and links for tasks, backups, and docker cleanup jobs in skip logs
- Update skip logs UI to display resource column with links to related resources, improving navigation and context
- Add fallback display when linked resources are deleted
- Expand tests to cover both restart scenarios: non-due jobs (should not fire) and due jobs (should fire)
---
app/Jobs/ScheduledJobManager.php | 15 +++-
app/Livewire/Settings/ScheduledJobs.php | 76 ++++++++++++++++++-
.../settings/scheduled-jobs.blade.php | 22 +++---
.../ScheduledJobManagerShouldRunNowTest.php | 46 +++++++----
tests/Feature/ScheduledJobMonitoringTest.php | 36 +++++++++
5 files changed, 166 insertions(+), 29 deletions(-)
diff --git a/app/Jobs/ScheduledJobManager.php b/app/Jobs/ScheduledJobManager.php
index fd641abb0..4195a1946 100644
--- a/app/Jobs/ScheduledJobManager.php
+++ b/app/Jobs/ScheduledJobManager.php
@@ -341,8 +341,19 @@ private function shouldRunNow(string $frequency, string $timezone, ?string $dedu
$lastDispatched = Cache::get($dedupKey);
- // Run if: never dispatched before, OR there's been a due time since last dispatch
- if ($lastDispatched === null || $previousDue->gt(Carbon::parse($lastDispatched))) {
+ if ($lastDispatched === null) {
+ // First run after restart or cache loss: only fire if actually due right now.
+ // Seed the cache so subsequent runs can use tolerance/catch-up logic.
+ $isDue = $cron->isDue($executionTime);
+ if ($isDue) {
+ Cache::put($dedupKey, $executionTime->toIso8601String(), 86400);
+ }
+
+ return $isDue;
+ }
+
+ // Subsequent runs: fire if there's been a due time since last dispatch
+ if ($previousDue->gt(Carbon::parse($lastDispatched))) {
Cache::put($dedupKey, $executionTime->toIso8601String(), 86400);
return true;
diff --git a/app/Livewire/Settings/ScheduledJobs.php b/app/Livewire/Settings/ScheduledJobs.php
index 4947dd19b..1e54f1483 100644
--- a/app/Livewire/Settings/ScheduledJobs.php
+++ b/app/Livewire/Settings/ScheduledJobs.php
@@ -3,8 +3,11 @@
namespace App\Livewire\Settings;
use App\Models\DockerCleanupExecution;
+use App\Models\ScheduledDatabaseBackup;
use App\Models\ScheduledDatabaseBackupExecution;
+use App\Models\ScheduledTask;
use App\Models\ScheduledTaskExecution;
+use App\Models\Server;
use App\Services\SchedulerLogParser;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
@@ -102,13 +105,84 @@ private function loadData(?int $teamId = null): void
$parser = new SchedulerLogParser;
$allSkips = $parser->getRecentSkips(500, $teamId);
$this->skipTotalCount = $allSkips->count();
- $this->skipLogs = $allSkips->slice($this->skipPage, $this->skipDefaultTake)->values();
+ $this->skipLogs = $this->enrichSkipLogsWithLinks(
+ $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);
}
+ private function enrichSkipLogsWithLinks(Collection $skipLogs): Collection
+ {
+ $taskIds = $skipLogs->where('type', 'task')->pluck('context.task_id')->filter()->unique()->values();
+ $backupIds = $skipLogs->where('type', 'backup')->pluck('context.backup_id')->filter()->unique()->values();
+ $serverIds = $skipLogs->where('type', 'docker_cleanup')->pluck('context.server_id')->filter()->unique()->values();
+
+ $tasks = $taskIds->isNotEmpty()
+ ? ScheduledTask::with(['application.environment.project', 'service.environment.project'])->whereIn('id', $taskIds)->get()->keyBy('id')
+ : collect();
+
+ $backups = $backupIds->isNotEmpty()
+ ? ScheduledDatabaseBackup::with(['database.environment.project'])->whereIn('id', $backupIds)->get()->keyBy('id')
+ : collect();
+
+ $servers = $serverIds->isNotEmpty()
+ ? Server::whereIn('id', $serverIds)->get()->keyBy('id')
+ : collect();
+
+ return $skipLogs->map(function (array $skip) use ($tasks, $backups, $servers): array {
+ $skip['link'] = null;
+ $skip['resource_name'] = null;
+
+ if ($skip['type'] === 'task') {
+ $task = $tasks->get($skip['context']['task_id'] ?? null);
+ if ($task) {
+ $skip['resource_name'] = $skip['context']['task_name'] ?? $task->name;
+ $resource = $task->application ?? $task->service;
+ $environment = $resource?->environment;
+ $project = $environment?->project;
+ if ($project && $environment && $resource) {
+ $routeName = $task->application_id
+ ? 'project.application.scheduled-tasks'
+ : 'project.service.scheduled-tasks';
+ $routeKey = $task->application_id ? 'application_uuid' : 'service_uuid';
+ $skip['link'] = route($routeName, [
+ 'project_uuid' => $project->uuid,
+ 'environment_uuid' => $environment->uuid,
+ $routeKey => $resource->uuid,
+ 'task_uuid' => $task->uuid,
+ ]);
+ }
+ }
+ } elseif ($skip['type'] === 'backup') {
+ $backup = $backups->get($skip['context']['backup_id'] ?? null);
+ if ($backup) {
+ $database = $backup->database;
+ $skip['resource_name'] = $database?->name ?? 'Database backup';
+ $environment = $database?->environment;
+ $project = $environment?->project;
+ if ($project && $environment && $database) {
+ $skip['link'] = route('project.database.backup.index', [
+ 'project_uuid' => $project->uuid,
+ 'environment_uuid' => $environment->uuid,
+ 'database_uuid' => $database->uuid,
+ ]);
+ }
+ }
+ } elseif ($skip['type'] === 'docker_cleanup') {
+ $server = $servers->get($skip['context']['server_id'] ?? null);
+ if ($server) {
+ $skip['resource_name'] = $server->name;
+ $skip['link'] = route('server.show', ['server_uuid' => $server->uuid]);
+ }
+ }
+
+ return $skip;
+ });
+ }
+
private function getExecutions(?int $teamId = null): Collection
{
$dateFrom = $this->getDateFrom();
diff --git a/resources/views/livewire/settings/scheduled-jobs.blade.php b/resources/views/livewire/settings/scheduled-jobs.blade.php
index 60acc9062..7c0db860f 100644
--- a/resources/views/livewire/settings/scheduled-jobs.blade.php
+++ b/resources/views/livewire/settings/scheduled-jobs.blade.php
@@ -213,8 +213,8 @@ class="border-b border-gray-200 dark:border-coolgray-400">
| Time |
Type |
+ Resource |
Reason |
- Details |
@@ -235,6 +235,17 @@ class="border-b border-gray-200 dark:border-coolgray-400">
{{ 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 @@ class="border-b border-gray-200 dark:border-coolgray-400">
@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 @@
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 @@
$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 @@
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 @@
$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 @@
// 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);
+ }
+});
From 9a4b4280be5ad6e238cea4ffc267d64c8cd5289a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sat, 28 Feb 2026 18:37:51 +0100
Subject: [PATCH 7/7] refactor(jobs): split task skip checks into critical and
runtime phases
Move expensive runtime checks (service/application status) after cron
validation to avoid running them for tasks that aren't due. Critical
checks (orphans, infrastructure) remain in first phase.
Also fix database heading parameters to be built from the model.
---
app/Jobs/ScheduledJobManager.php | 49 ++++++++++++++++-------
app/Livewire/Project/Database/Heading.php | 6 ++-
2 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/app/Jobs/ScheduledJobManager.php b/app/Jobs/ScheduledJobManager.php
index 4195a1946..e68e3b613 100644
--- a/app/Jobs/ScheduledJobManager.php
+++ b/app/Jobs/ScheduledJobManager.php
@@ -214,10 +214,12 @@ private function processScheduledTasks(): void
foreach ($tasks as $task) {
try {
$server = $task->server();
- $skipReason = $this->getTaskSkipReason($task, $server);
- if ($skipReason !== null) {
+
+ // Phase 1: Critical checks (always — cheap, handles orphans and infra issues)
+ $criticalSkip = $this->getTaskCriticalSkipReason($task, $server);
+ if ($criticalSkip !== null) {
$this->skippedCount++;
- $this->logSkip('task', $skipReason, [
+ $this->logSkip('task', $criticalSkip, [
'task_id' => $task->id,
'task_name' => $task->name,
'team_id' => $server?->team_id,
@@ -237,16 +239,31 @@ private function processScheduledTasks(): void
$frequency = VALID_CRON_STRINGS[$frequency];
}
- if ($this->shouldRunNow($frequency, $serverTimezone, "scheduled-task:{$task->id}")) {
- ScheduledTaskJob::dispatch($task);
- $this->dispatchedCount++;
- Log::channel('scheduled')->info('Task dispatched', [
+ if (! $this->shouldRunNow($frequency, $serverTimezone, "scheduled-task:{$task->id}")) {
+ continue;
+ }
+
+ // Phase 2: Runtime checks (only when cron is due — avoids noise for stopped resources)
+ $runtimeSkip = $this->getTaskRuntimeSkipReason($task);
+ if ($runtimeSkip !== null) {
+ $this->skippedCount++;
+ $this->logSkip('task', $runtimeSkip, [
'task_id' => $task->id,
'task_name' => $task->name,
'team_id' => $server->team_id,
- 'server_id' => $server->id,
]);
+
+ continue;
}
+
+ ScheduledTaskJob::dispatch($task);
+ $this->dispatchedCount++;
+ Log::channel('scheduled')->info('Task dispatched', [
+ 'task_id' => $task->id,
+ 'task_name' => $task->name,
+ 'team_id' => $server->team_id,
+ 'server_id' => $server->id,
+ ]);
} catch (\Exception $e) {
Log::channel('scheduled-errors')->error('Error processing task', [
'task_id' => $task->id,
@@ -281,11 +298,8 @@ private function getBackupSkipReason(ScheduledDatabaseBackup $backup, ?Server $s
return null;
}
- private function getTaskSkipReason(ScheduledTask $task, ?Server $server): ?string
+ private function getTaskCriticalSkipReason(ScheduledTask $task, ?Server $server): ?string
{
- $service = $task->service;
- $application = $task->application;
-
if (blank($server)) {
$task->delete();
@@ -300,17 +314,22 @@ private function getTaskSkipReason(ScheduledTask $task, ?Server $server): ?strin
return 'subscription_unpaid';
}
- if (! $service && ! $application) {
+ if (! $task->service && ! $task->application) {
$task->delete();
return 'resource_deleted';
}
- if ($application && str($application->status)->contains('running') === false) {
+ return null;
+ }
+
+ private function getTaskRuntimeSkipReason(ScheduledTask $task): ?string
+ {
+ if ($task->application && str($task->application->status)->contains('running') === false) {
return 'application_not_running';
}
- if ($service && str($service->status)->contains('running') === false) {
+ if ($task->service && str($task->service->status)->contains('running') === false) {
return 'service_not_running';
}
diff --git a/app/Livewire/Project/Database/Heading.php b/app/Livewire/Project/Database/Heading.php
index 8d3d8e294..c6c9a3c48 100644
--- a/app/Livewire/Project/Database/Heading.php
+++ b/app/Livewire/Project/Database/Heading.php
@@ -69,7 +69,11 @@ public function manualCheckStatus()
public function mount()
{
- $this->parameters = get_route_parameters();
+ $this->parameters = [
+ 'project_uuid' => $this->database->environment->project->uuid,
+ 'environment_uuid' => $this->database->environment->uuid,
+ 'database_uuid' => $this->database->uuid,
+ ];
}
public function stop()
-
From f68793ed69de6167926fa0f34e3574034b71e46c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sat, 28 Feb 2026 13:18:44 +0100
Subject: [PATCH 3/7] feat(jobs): optimize async job dispatches and enhance
Stripe subscription sync
Reduce unnecessary job queue pressure and improve subscription sync reliability:
- Cache ServerStorageCheckJob dispatch to only trigger on disk percentage changes
- Rate-limit ConnectProxyToNetworksJob to maximum once per 10 minutes
- Add progress callback support to SyncStripeSubscriptionsJob for UI feedback
- Implement bulk fetching of valid Stripe subscription IDs for efficiency
- Detect and report resubscribed users (same email, different customer ID)
- Fix CleanupUnreachableServers query operator (>= 3 instead of = 3)
- Improve empty subId validation in PushServerUpdateJob
- Optimize relationship access by using properties instead of query methods
- Add comprehensive test coverage for all optimizations
---
.../Commands/CleanupUnreachableServers.php | 2 +-
.../Cloud/SyncStripeSubscriptions.php | 22 ++-
app/Jobs/PushServerUpdateJob.php | 33 +++-
app/Jobs/SyncStripeSubscriptionsJob.php | 159 +++++++++++++++---
.../Feature/CleanupUnreachableServersTest.php | 73 ++++++++
.../PushServerUpdateJobOptimizationTest.php | 150 +++++++++++++++++
6 files changed, 402 insertions(+), 37 deletions(-)
create mode 100644 tests/Feature/CleanupUnreachableServersTest.php
create mode 100644 tests/Feature/PushServerUpdateJobOptimizationTest.php
diff --git a/app/Console/Commands/CleanupUnreachableServers.php b/app/Console/Commands/CleanupUnreachableServers.php
index def01b265..09563a2c3 100644
--- a/app/Console/Commands/CleanupUnreachableServers.php
+++ b/app/Console/Commands/CleanupUnreachableServers.php
@@ -14,7 +14,7 @@ class CleanupUnreachableServers extends Command
public function handle()
{
echo "Running unreachable server cleanup...\n";
- $servers = Server::where('unreachable_count', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(7))->get();
+ $servers = Server::where('unreachable_count', '>=', 3)->where('unreachable_notification_sent', true)->where('updated_at', '<', now()->subDays(7))->get();
if ($servers->count() > 0) {
foreach ($servers as $server) {
echo "Cleanup unreachable server ($server->id) with name $server->name";
diff --git a/app/Console/Commands/Cloud/SyncStripeSubscriptions.php b/app/Console/Commands/Cloud/SyncStripeSubscriptions.php
index e64f86926..46f6b4edd 100644
--- a/app/Console/Commands/Cloud/SyncStripeSubscriptions.php
+++ b/app/Console/Commands/Cloud/SyncStripeSubscriptions.php
@@ -36,7 +36,14 @@ public function handle(): int
$this->newLine();
$job = new SyncStripeSubscriptionsJob($fix);
- $result = $job->handle();
+ $fetched = 0;
+ $result = $job->handle(function (int $count) use (&$fetched): void {
+ $fetched = $count;
+ $this->output->write("\r Fetching subscriptions from Stripe... {$fetched}");
+ });
+ if ($fetched > 0) {
+ $this->output->write("\r".str_repeat(' ', 60)."\r");
+ }
if (isset($result['error'])) {
$this->error($result['error']);
@@ -68,6 +75,19 @@ public function handle(): int
$this->info('No discrepancies found. All subscriptions are in sync.');
}
+ if (count($result['resubscribed']) > 0) {
+ $this->newLine();
+ $this->warn('Resubscribed users (same email, different customer): '.count($result['resubscribed']));
+ $this->newLine();
+
+ foreach ($result['resubscribed'] as $resub) {
+ $this->line(" - Team ID: {$resub['team_id']} | Email: {$resub['email']}");
+ $this->line(" Old: {$resub['old_stripe_subscription_id']} (cus: {$resub['old_stripe_customer_id']})");
+ $this->line(" New: {$resub['new_stripe_subscription_id']} (cus: {$resub['new_stripe_customer_id']}) [{$resub['new_status']}]");
+ $this->newLine();
+ }
+ }
+
if (count($result['errors']) > 0) {
$this->newLine();
$this->error('Errors encountered: '.count($result['errors']));
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 5d018cf19..85684ff19 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -24,6 +24,7 @@
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
use Laravel\Horizon\Contracts\Silenced;
class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
@@ -130,7 +131,14 @@ public function handle()
$this->containers = collect(data_get($data, 'containers'));
$filesystemUsageRoot = data_get($data, 'filesystem_usage_root.used_percentage');
- ServerStorageCheckJob::dispatch($this->server, $filesystemUsageRoot);
+
+ // Only dispatch storage check when disk percentage actually changes
+ $storageCacheKey = 'storage-check:'.$this->server->id;
+ $lastPercentage = Cache::get($storageCacheKey);
+ if ($lastPercentage === null || (string) $lastPercentage !== (string) $filesystemUsageRoot) {
+ Cache::put($storageCacheKey, $filesystemUsageRoot, 600);
+ ServerStorageCheckJob::dispatch($this->server, $filesystemUsageRoot);
+ }
if ($this->containers->isEmpty()) {
return;
@@ -207,7 +215,7 @@ public function handle()
$serviceId = $labels->get('coolify.serviceId');
$subType = $labels->get('coolify.service.subType');
$subId = $labels->get('coolify.service.subId');
- if (empty($subId)) {
+ if (empty(trim((string) $subId))) {
continue;
}
if ($subType === 'application') {
@@ -327,6 +335,10 @@ private function aggregateServiceContainerStatuses()
// Parse key: serviceId:subType:subId
[$serviceId, $subType, $subId] = explode(':', $key);
+ if (empty($subId)) {
+ continue;
+ }
+
$service = $this->services->where('id', $serviceId)->first();
if (! $service) {
continue;
@@ -335,9 +347,9 @@ private function aggregateServiceContainerStatuses()
// Get the service sub-resource (ServiceApplication or ServiceDatabase)
$subResource = null;
if ($subType === 'application') {
- $subResource = $service->applications()->where('id', $subId)->first();
+ $subResource = $service->applications->where('id', $subId)->first();
} elseif ($subType === 'database') {
- $subResource = $service->databases()->where('id', $subId)->first();
+ $subResource = $service->databases->where('id', $subId)->first();
}
if (! $subResource) {
@@ -476,8 +488,13 @@ private function updateProxyStatus()
} catch (\Throwable $e) {
}
} else {
- // Connect proxy to networks asynchronously to avoid blocking the status update
- ConnectProxyToNetworksJob::dispatch($this->server);
+ // Connect proxy to networks periodically (every 10 min) to avoid excessive job dispatches.
+ // On-demand triggers (new network, service deploy) use dispatchSync() and bypass this.
+ $proxyCacheKey = 'connect-proxy:'.$this->server->id;
+ if (! Cache::has($proxyCacheKey)) {
+ Cache::put($proxyCacheKey, true, 600);
+ ConnectProxyToNetworksJob::dispatch($this->server);
+ }
}
}
}
@@ -545,7 +562,7 @@ private function updateServiceSubStatus(string $serviceId, string $subType, stri
return;
}
if ($subType === 'application') {
- $application = $service->applications()->where('id', $subId)->first();
+ $application = $service->applications->where('id', $subId)->first();
if ($application) {
if ($application->status !== $containerStatus) {
$application->status = $containerStatus;
@@ -553,7 +570,7 @@ private function updateServiceSubStatus(string $serviceId, string $subType, stri
}
}
} elseif ($subType === 'database') {
- $database = $service->databases()->where('id', $subId)->first();
+ $database = $service->databases->where('id', $subId)->first();
if ($database) {
if ($database->status !== $containerStatus) {
$database->status = $containerStatus;
diff --git a/app/Jobs/SyncStripeSubscriptionsJob.php b/app/Jobs/SyncStripeSubscriptionsJob.php
index 9eb946e4d..4301a80d1 100644
--- a/app/Jobs/SyncStripeSubscriptionsJob.php
+++ b/app/Jobs/SyncStripeSubscriptionsJob.php
@@ -22,7 +22,7 @@ public function __construct(public bool $fix = false)
$this->onQueue('high');
}
- public function handle(): array
+ public function handle(?\Closure $onProgress = null): array
{
if (! isCloud() || ! isStripe()) {
return ['error' => 'Not running on Cloud or Stripe not configured'];
@@ -33,48 +33,73 @@ public function handle(): array
->get();
$stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
+
+ // Bulk fetch all valid subscription IDs from Stripe (active + past_due)
+ $validStripeIds = $this->fetchValidStripeSubscriptionIds($stripe, $onProgress);
+
+ // Find DB subscriptions not in the valid set
+ $staleSubscriptions = $subscriptions->filter(
+ fn (Subscription $sub) => ! in_array($sub->stripe_subscription_id, $validStripeIds)
+ );
+
+ // For each stale subscription, get the exact Stripe status and check for resubscriptions
$discrepancies = [];
+ $resubscribed = [];
$errors = [];
- foreach ($subscriptions as $subscription) {
+ foreach ($staleSubscriptions as $subscription) {
try {
$stripeSubscription = $stripe->subscriptions->retrieve(
$subscription->stripe_subscription_id
);
+ $stripeStatus = $stripeSubscription->status;
- // Check if Stripe says cancelled but we think it's active
- if (in_array($stripeSubscription->status, ['canceled', 'incomplete_expired', 'unpaid'])) {
- $discrepancies[] = [
- 'subscription_id' => $subscription->id,
- 'team_id' => $subscription->team_id,
- 'stripe_subscription_id' => $subscription->stripe_subscription_id,
- 'stripe_status' => $stripeSubscription->status,
- ];
-
- // Only fix if --fix flag is passed
- if ($this->fix) {
- $subscription->update([
- 'stripe_invoice_paid' => false,
- 'stripe_past_due' => false,
- ]);
-
- if ($stripeSubscription->status === 'canceled') {
- $subscription->team?->subscriptionEnded();
- }
- }
- }
-
- // Small delay to avoid Stripe rate limits
- usleep(100000); // 100ms
+ usleep(100000); // 100ms rate limit delay
} catch (\Exception $e) {
$errors[] = [
'subscription_id' => $subscription->id,
'error' => $e->getMessage(),
];
+
+ continue;
+ }
+
+ // Check if this user resubscribed under a different customer/subscription
+ $activeSub = $this->findActiveSubscriptionByEmail($stripe, $stripeSubscription->customer);
+ if ($activeSub) {
+ $resubscribed[] = [
+ 'subscription_id' => $subscription->id,
+ 'team_id' => $subscription->team_id,
+ 'email' => $activeSub['email'],
+ 'old_stripe_subscription_id' => $subscription->stripe_subscription_id,
+ 'old_stripe_customer_id' => $stripeSubscription->customer,
+ 'new_stripe_subscription_id' => $activeSub['subscription_id'],
+ 'new_stripe_customer_id' => $activeSub['customer_id'],
+ 'new_status' => $activeSub['status'],
+ ];
+
+ continue;
+ }
+
+ $discrepancies[] = [
+ 'subscription_id' => $subscription->id,
+ 'team_id' => $subscription->team_id,
+ 'stripe_subscription_id' => $subscription->stripe_subscription_id,
+ 'stripe_status' => $stripeStatus,
+ ];
+
+ if ($this->fix) {
+ $subscription->update([
+ 'stripe_invoice_paid' => false,
+ 'stripe_past_due' => false,
+ ]);
+
+ if ($stripeStatus === 'canceled') {
+ $subscription->team?->subscriptionEnded();
+ }
}
}
- // Only notify if discrepancies found and fixed
if ($this->fix && count($discrepancies) > 0) {
send_internal_notification(
'SyncStripeSubscriptionsJob: Fixed '.count($discrepancies)." discrepancies:\n".
@@ -85,8 +110,88 @@ public function handle(): array
return [
'total_checked' => $subscriptions->count(),
'discrepancies' => $discrepancies,
+ 'resubscribed' => $resubscribed,
'errors' => $errors,
'fixed' => $this->fix,
];
}
+
+ /**
+ * Given a Stripe customer ID, get their email and search for other customers
+ * with the same email that have an active subscription.
+ *
+ * @return array{email: string, customer_id: string, subscription_id: string, status: string}|null
+ */
+ private function findActiveSubscriptionByEmail(\Stripe\StripeClient $stripe, string $customerId): ?array
+ {
+ try {
+ $customer = $stripe->customers->retrieve($customerId);
+ $email = $customer->email;
+
+ if (! $email) {
+ return null;
+ }
+
+ usleep(100000);
+
+ $customers = $stripe->customers->all([
+ 'email' => $email,
+ 'limit' => 10,
+ ]);
+
+ usleep(100000);
+
+ foreach ($customers->data as $matchingCustomer) {
+ if ($matchingCustomer->id === $customerId) {
+ continue;
+ }
+
+ $subs = $stripe->subscriptions->all([
+ 'customer' => $matchingCustomer->id,
+ 'limit' => 10,
+ ]);
+
+ usleep(100000);
+
+ foreach ($subs->data as $sub) {
+ if (in_array($sub->status, ['active', 'past_due'])) {
+ return [
+ 'email' => $email,
+ 'customer_id' => $matchingCustomer->id,
+ 'subscription_id' => $sub->id,
+ 'status' => $sub->status,
+ ];
+ }
+ }
+ }
+ } catch (\Exception $e) {
+ // Silently skip — will fall through to normal discrepancy
+ }
+
+ return null;
+ }
+
+ /**
+ * Bulk fetch all active and past_due subscription IDs from Stripe.
+ *
+ * @return array