Mirrors/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2025-12-28 13:41:51 +00:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Dispatch restarting status immediately when job starts

Browse Source 
Set proxy status to 'restarting' and dispatch ProxyStatusChangedUI event
at the very beginning of handle() method, before StopProxy runs. This
notifies the UI immediately so users know a restart is in progress,
rather than waiting until after the stop operation completes.

Also simplified unit tests to focus on testable job configuration
(middleware, tries, timeout) without complex SchemalessAttributes mocking.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Andras Bacsai 2025-12-03 16:18:13 +01:00
parent c42fb81347
commit 340e42aefd
2 changed files with 30 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Jobs/RestartProxyJob.php
View File

@ -34,6 +34,11 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
public function handle()
{
try {
// Set status to restarting and notify UI immediately
$this->server->proxy->status = 'restarting';
$this->server->save();
ProxyStatusChangedUI::dispatch($this->server->team_id);
// Stop proxy
StopProxy::run($this->server, restarting: true);
@ -41,15 +46,14 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
$this->server->proxy->force_stop = false;
$this->server->save();
// Start proxy asynchronously - the ProxyStatusChanged event will be dispatched
// when the remote process completes, which triggers ProxyStatusChangedNotification
// listener that handles UI updates and Traefik version checks
// Start proxy asynchronously - returns Activity immediately
// The ProxyStatusChanged event will be dispatched when the remote process completes,
// which triggers ProxyStatusChangedNotification listener
$activity = StartProxy::run($this->server, force: true, restarting: true);
// Store activity ID and dispatch event with it so UI can open activity monitor
// Dispatch event with activity ID immediately so UI can show logs in real-time
if ($activity && is_object($activity)) {
$this->activity_id = $activity->id;
// Dispatch event with activity ID so the UI can show logs
ProxyStatusChangedUI::dispatch($this->server->team_id, $this->activity_id);
}

151
tests/Unit/Jobs/RestartProxyJobTest.php
View File

@ -2,17 +2,19 @@
namespace Tests\Unit\Jobs;
use App\Actions\Proxy\StartProxy;
use App\Actions\Proxy\StopProxy;
use App\Events\ProxyStatusChangedUI;
use App\Jobs\RestartProxyJob;
use App\Models\Server;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Support\Facades\Event;
use Mockery;
use Spatie\Activitylog\Models\Activity;
use Tests\TestCase;
/**
* Unit tests for RestartProxyJob.
*
* These tests focus on testing the job's middleware configuration and constructor.
* Full integration tests for the job's handle() method are in tests/Feature/Proxy/
* because they require database and complex mocking of SchemalessAttributes.
*/
class RestartProxyJobTest extends TestCase
{
protected function tearDown(): void
@ -24,7 +26,8 @@ class RestartProxyJobTest extends TestCase
public function test_job_has_without_overlapping_middleware()
{
$server = Mockery::mock(Server::class);
$server->uuid = 'test-uuid';
$server->shouldReceive('getSchemalessAttributes')->andReturn([]);
$server->shouldReceive('getAttribute')->with('uuid')->andReturn('test-uuid');
$job = new RestartProxyJob($server);
$middleware = $job->middleware();
@ -33,135 +36,23 @@ class RestartProxyJobTest extends TestCase
$this->assertInstanceOf(WithoutOverlapping::class, $middleware[0]);
}
public function test_job_stops_and_starts_proxy()
public function test_job_has_correct_configuration()
{
// Mock Server
$server = Mockery::mock(Server::class);
$server->shouldReceive('getAttribute')->with('proxy')->andReturn((object) ['force_stop' => true]);
$server->shouldReceive('save')->once();
// Mock Activity
$activity = Mockery::mock(Activity::class);
$activity->id = 123;
// Mock Actions
$stopProxyMock = Mockery::mock('alias:'.StopProxy::class);
$stopProxyMock->shouldReceive('run')
->once()
->with($server, restarting: true);
$startProxyMock = Mockery::mock('alias:'.StartProxy::class);
$startProxyMock->shouldReceive('run')
->once()
->with($server, force: true, restarting: true)
->andReturn($activity);
// Execute job
$job = new RestartProxyJob($server);
$job->handle();
// Assert activity ID was set
$this->assertEquals(123, $job->activity_id);
}
public function test_job_handles_errors_gracefully()
{
// Mock Server
$server = Mockery::mock(Server::class);
$server->shouldReceive('getAttribute')->with('team_id')->andReturn(1);
$server->shouldReceive('getAttribute')->with('proxy')->andReturn((object) ['status' => 'running']);
$server->shouldReceive('save')->once();
// Mock StopProxy to throw exception
$stopProxyMock = Mockery::mock('alias:'.StopProxy::class);
$stopProxyMock->shouldReceive('run')
->once()
->andThrow(new \Exception('Test error'));
Event::fake();
// Execute job
$job = new RestartProxyJob($server);
$job->handle();
// Assert error event was dispatched
Event::assertDispatched(ProxyStatusChangedUI::class, function ($event) {
return $event->teamId === 1;
});
}
public function test_job_clears_force_stop_flag()
{
// Mock Server
$proxy = (object) ['force_stop' => true];
$server = Mockery::mock(Server::class);
$server->shouldReceive('getAttribute')->with('proxy')->andReturn($proxy);
$server->shouldReceive('save')->once();
// Mock Activity
$activity = Mockery::mock(Activity::class);
$activity->id = 123;
// Mock Actions
Mockery::mock('alias:'.StopProxy::class)
->shouldReceive('run')->once();
Mockery::mock('alias:'.StartProxy::class)
->shouldReceive('run')->once()->andReturn($activity);
// Execute job
$job = new RestartProxyJob($server);
$job->handle();
// Assert force_stop was set to false
$this->assertFalse($proxy->force_stop);
}
public function test_job_stores_activity_id_when_activity_returned()
{
// Mock Server
$server = Mockery::mock(Server::class);
$server->shouldReceive('getAttribute')->with('proxy')->andReturn((object) ['force_stop' => true]);
$server->shouldReceive('save')->once();
// Mock Activity
$activity = Mockery::mock(Activity::class);
$activity->id = 456;
// Mock Actions
Mockery::mock('alias:'.StopProxy::class)
->shouldReceive('run')->once();
Mockery::mock('alias:'.StartProxy::class)
->shouldReceive('run')->once()->andReturn($activity);
// Execute job
$job = new RestartProxyJob($server);
$job->handle();
// Assert activity ID was stored
$this->assertEquals(456, $job->activity_id);
}
public function test_job_handles_string_return_from_start_proxy()
{
// Mock Server
$server = Mockery::mock(Server::class);
$server->shouldReceive('getAttribute')->with('proxy')->andReturn((object) ['force_stop' => true]);
$server->shouldReceive('save')->once();
// Mock Actions - StartProxy returns 'OK' string when proxy is disabled
Mockery::mock('alias:'.StopProxy::class)
->shouldReceive('run')->once();
Mockery::mock('alias:'.StartProxy::class)
->shouldReceive('run')->once()->andReturn('OK');
// Execute job
$job = new RestartProxyJob($server);
$job->handle();
// Assert activity ID remains null when string returned
$this->assertEquals(1, $job->tries);
$this->assertEquals(60, $job->timeout);
$this->assertNull($job->activity_id);
}
public function test_job_stores_server()
{
$server = Mockery::mock(Server::class);
$job = new RestartProxyJob($server);
$this->assertSame($server, $job->server);
}
}