direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-04-19 09:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add workers to servers (#547)

Browse Source
This commit is contained in:
Saeed Vaziry 2025-03-16 14:09:15 +01:00 committed by GitHub
parent 48ae561ea4
commit 72352aad8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
42 changed files with 603 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Database/SyncDatabaseUsers.php
View File

@ -12,7 +12,7 @@ class SyncDatabaseUsers
public function sync(Server $server): void
{
$service = $server->database();
if (! $service) {
if (! $service instanceof \App\Models\Service) {
return;
}
/** @var Database $handler */

2
app/Actions/Database/SyncDatabases.php
View File

@ -12,7 +12,7 @@ class SyncDatabases
public function sync(Server $server): void
{
$service = $server->database();
if (! $service) {
if (! $service instanceof \App\Models\Service) {
return;
}
/** @var Database $handler */

13
app/Actions/Queue/DeleteQueue.php
View File

@ -1,13 +0,0 @@
<?php
namespace App\Actions\Queue;
use App\Models\Queue;
class DeleteQueue
{
public function delete(Queue $queue): void
{
$queue->delete();
}
}

21
app/Actions/Queue/GetQueueLogs.php
View File

@ -1,21 +0,0 @@
<?php
namespace App\Actions\Queue;
use App\Models\Queue;
use App\Models\Service;
use App\SSH\Services\ProcessManager\ProcessManager;
class GetQueueLogs
{
public function getLogs(Queue $queue): string
{
/** @var Service $service */
$service = $queue->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
return $handler->getLogs($queue->user, $queue->getLogFile());
}
}

56
app/Actions/Queue/ManageQueue.php
View File

@ -1,56 +0,0 @@
<?php
namespace App\Actions\Queue;
use App\Enums\QueueStatus;
use App\Models\Queue;
use App\Models\Service;
use App\SSH\Services\ProcessManager\ProcessManager;
class ManageQueue
{
public function start(Queue $queue): void
{
$queue->status = QueueStatus::STARTING;
$queue->save();
dispatch(function () use ($queue): void {
/** @var Service $service */
$service = $queue->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->start($queue->id, $queue->site_id);
$queue->status = QueueStatus::RUNNING;
$queue->save();
})->onConnection('ssh');
}
public function stop(Queue $queue): void
{
$queue->status = QueueStatus::STOPPING;
$queue->save();
dispatch(function () use ($queue): void {
/** @var Service $service */
$service = $queue->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->stop($queue->id, $queue->site_id);
$queue->status = QueueStatus::STOPPED;
$queue->save();
})->onConnection('ssh');
}
public function restart(Queue $queue): void
{
$queue->status = QueueStatus::RESTARTING;
$queue->save();
dispatch(function () use ($queue): void {
/** @var Service $service */
$service = $queue->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->restart($queue->id, $queue->site_id);
$queue->status = QueueStatus::RUNNING;
$queue->save();
})->onConnection('ssh');
}
}

57
app/Actions/Queue/EditQueue.php → app/Actions/Worker/CreateWorker.php
View File

@ -1,63 +1,63 @@
<?php
namespace App\Actions\Queue;
namespace App\Actions\Worker;
use App\Enums\QueueStatus;
use App\Models\Queue;
use App\Enums\WorkerStatus;
use App\Models\Server;
use App\Models\Service;
use App\Models\Site;
use App\Models\Worker;
use App\SSH\Services\ProcessManager\ProcessManager;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
class EditQueue
class CreateWorker
{
/**
* @param array<string, mixed> $input
*
* @throws ValidationException
*/
public function edit(Queue $queue, array $input): void
public function create(Server $server, array $input, ?Site $site = null): void
{
$queue->fill([
$worker = new Worker([
'server_id' => $server->id,
'site_id' => $site?->id,
'command' => $input['command'],
'user' => $input['user'],
'auto_start' => $input['auto_start'] ? 1 : 0,
'auto_restart' => $input['auto_restart'] ? 1 : 0,
'numprocs' => $input['numprocs'],
'status' => QueueStatus::RESTARTING,
'status' => WorkerStatus::CREATING,
]);
$queue->save();
$worker->save();
dispatch(function () use ($queue): void {
dispatch(function () use ($worker): void {
/** @var Service $service */
$service = $queue->server->processManager();
$service = $worker->server->processManager();
/** @var ProcessManager $processManager */
$processManager = $service->handler();
$processManager->delete($queue->id, $queue->site_id);
$processManager->create(
$queue->id,
$queue->command,
$queue->user,
$queue->auto_start,
$queue->auto_restart,
$queue->numprocs,
$queue->getLogFile(),
$queue->site_id
$worker->id,
$worker->command,
$worker->user,
$worker->auto_start,
$worker->auto_restart,
$worker->numprocs,
$worker->getLogFile(),
$worker->site_id
);
$queue->status = QueueStatus::RUNNING;
$queue->save();
})->catch(function () use ($queue): void {
$queue->status = QueueStatus::FAILED;
$queue->save();
$worker->status = WorkerStatus::RUNNING;
$worker->save();
})->catch(function () use ($worker): void {
$worker->delete();
})->onConnection('ssh');
}
/**
* @return array<string, array<string>>
*/
public static function rules(Server $server): array
public static function rules(Server $server, ?Site $site = null): array
{
return [
'command' => [
@ -65,10 +65,7 @@ public static function rules(Server $server): array
],
'user' => [
'required',
Rule::in([
'root',
$server->ssh_user,
]),
Rule::in($site?->getSshUsers() ?? $server->getSshUsers()),
],
'numprocs' => [
'required',

13
app/Actions/Worker/DeleteWorker.php Normal file
View File

@ -0,0 +1,13 @@
<?php
namespace App\Actions\Worker;
use App\Models\Worker;
class DeleteWorker
{
public function delete(Worker $worker): void
{
$worker->delete();
}
}

57
app/Actions/Queue/CreateQueue.php → app/Actions/Worker/EditWorker.php
View File

@ -1,64 +1,64 @@
<?php
namespace App\Actions\Queue;
namespace App\Actions\Worker;
use App\Enums\QueueStatus;
use App\Models\Queue;
use App\Enums\WorkerStatus;
use App\Models\Server;
use App\Models\Service;
use App\Models\Site;
use App\Models\Worker;
use App\SSH\Services\ProcessManager\ProcessManager;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
class CreateQueue
class EditWorker
{
/**
* @param Server|Site $queueable
* @param array<string, mixed> $input
*
* @throws ValidationException
*/
public function create(mixed $queueable, array $input): void
public function edit(Worker $worker, array $input): void
{
$queue = new Queue([
'server_id' => $queueable instanceof Server ? $queueable->id : $queueable->server_id,
'site_id' => $queueable instanceof Site ? $queueable->id : null,
$worker->fill([
'command' => $input['command'],
'user' => $input['user'],
'auto_start' => $input['auto_start'] ? 1 : 0,
'auto_restart' => $input['auto_restart'] ? 1 : 0,
'numprocs' => $input['numprocs'],
'status' => QueueStatus::CREATING,
'status' => WorkerStatus::RESTARTING,
]);
$queue->save();
$worker->save();
dispatch(function () use ($queue): void {
dispatch(function () use ($worker): void {
/** @var Service $service */
$service = $queue->server->processManager();
$service = $worker->server->processManager();
/** @var ProcessManager $processManager */
$processManager = $service->handler();
$processManager->delete($worker->id, $worker->site_id);
$processManager->create(
$queue->id,
$queue->command,
$queue->user,
$queue->auto_start,
$queue->auto_restart,
$queue->numprocs,
$queue->getLogFile(),
$queue->site_id
$worker->id,
$worker->command,
$worker->user,
$worker->auto_start,
$worker->auto_restart,
$worker->numprocs,
$worker->getLogFile(),
$worker->site_id
);
$queue->status = QueueStatus::RUNNING;
$queue->save();
})->catch(function () use ($queue): void {
$queue->delete();
$worker->status = WorkerStatus::RUNNING;
$worker->save();
})->catch(function () use ($worker): void {
$worker->status = WorkerStatus::FAILED;
$worker->save();
})->onConnection('ssh');
}
/**
* @return array<string, array<string>>
*/
public static function rules(Site $site): array
public static function rules(Server $server, ?Site $site = null): array
{
return [
'command' => [
@ -66,10 +66,7 @@ public static function rules(Site $site): array
],
'user' => [
'required',
Rule::in([
'root',
$site->user,
]),
Rule::in($site?->getSshUsers() ?? $server->getSshUsers()),
],
'numprocs' => [
'required',

21
app/Actions/Worker/GetWorkerLogs.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace App\Actions\Worker;
use App\Models\Service;
use App\Models\Worker;
use App\SSH\Services\ProcessManager\ProcessManager;
class GetWorkerLogs
{
public function getLogs(Worker $worker): string
{
/** @var Service $service */
$service = $worker->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
return $handler->getLogs($worker->user, $worker->getLogFile());
}
}

56
app/Actions/Worker/ManageWorker.php Normal file
View File

@ -0,0 +1,56 @@
<?php
namespace App\Actions\Worker;
use App\Enums\WorkerStatus;
use App\Models\Service;
use App\Models\Worker;
use App\SSH\Services\ProcessManager\ProcessManager;
class ManageWorker
{
public function start(Worker $worker): void
{
$worker->status = WorkerStatus::STARTING;
$worker->save();
dispatch(function () use ($worker): void {
/** @var Service $service */
$service = $worker->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->start($worker->id, $worker->site_id);
$worker->status = WorkerStatus::RUNNING;
$worker->save();
})->onConnection('ssh');
}
public function stop(Worker $worker): void
{
$worker->status = WorkerStatus::STOPPING;
$worker->save();
dispatch(function () use ($worker): void {
/** @var Service $service */
$service = $worker->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->stop($worker->id, $worker->site_id);
$worker->status = WorkerStatus::STOPPED;
$worker->save();
})->onConnection('ssh');
}
public function restart(Worker $worker): void
{
$worker->status = WorkerStatus::RESTARTING;
$worker->save();
dispatch(function () use ($worker): void {
/** @var Service $service */
$service = $worker->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->restart($worker->id, $worker->site_id);
$worker->status = WorkerStatus::RUNNING;
$worker->save();
})->onConnection('ssh');
}
}

2
app/Console/Commands/MigrateFromMysqlToSqlite.php
View File

@ -37,7 +37,7 @@ public function handle(): void
$this->migrateModel(\App\Models\GitHook::class);
$this->migrateModel(\App\Models\NotificationChannel::class);
$this->migrateModel(\App\Models\Project::class);
$this->migrateModel(\App\Models\Queue::class);
$this->migrateModel(\App\Models\Worker::class);
$this->migrateModel(\App\Models\Server::class);
$this->migrateModel(\App\Models\ServerLog::class);
$this->migrateModel(\App\Models\ServerProvider::class);

2
app/Console/Kernel.php
View File

@ -26,7 +26,5 @@ protected function schedule(Schedule $schedule): void
protected function commands(): void
{
$this->load(__DIR__.'/Commands');
require base_path('routes/console.php');
}
}

2
app/Enums/SiteFeature.php
View File

@ -10,7 +10,7 @@ final class SiteFeature
const SSL = 'ssl';
const QUEUES = 'queues';
const WORKERS = 'workers';
const COMMANDS = 'commands';
}

2
app/Enums/QueueStatus.php → app/Enums/WorkerStatus.php
View File

@ -2,7 +2,7 @@
namespace App\Enums;
final class QueueStatus
final class WorkerStatus
{
const RUNNING = 'running';

16
app/Models/Server.php
View File

@ -58,7 +58,7 @@
* @property Collection<int, DatabaseUser> $databaseUsers
* @property Collection<int, FirewallRule> $firewallRules
* @property Collection<int, CronJob> $cronJobs
* @property Collection<int, Queue> $queues
* @property Collection<int, Worker> $queues
* @property Collection<int, Backup> $backups
* @property Collection<int, SshKey> $sshKeys
* @property Collection<int, Tag> $tags
@ -125,7 +125,7 @@ public static function boot(): void
try {
$server->sites()->each(function ($site): void {
/** @var Site $site */
$site->queues()->delete();
$site->workers()->delete();
$site->ssls()->delete();
$site->deployments()->delete();
$site->deploymentScript()->delete();
@ -140,7 +140,7 @@ public static function boot(): void
$server->databaseUsers()->delete();
$server->firewallRules()->delete();
$server->cronJobs()->delete();
$server->queues()->delete();
$server->workers()->delete();
$server->daemons()->delete();
$server->sshKeys()->detach();
if (File::exists($server->sshKey()['public_key_path'])) {
@ -265,11 +265,11 @@ public function cronJobs(): HasMany
}
/**
* @return HasMany<Queue, covariant $this>
* @return HasMany<Worker, covariant $this>
*/
public function queues(): HasMany
public function workers(): HasMany
{
return $this->hasMany(Queue::class);
return $this->hasMany(Worker::class);
}
/**
@ -281,11 +281,11 @@ public function backups(): HasMany
}
/**
* @return HasMany<Queue, covariant $this>
* @return HasMany<Worker, covariant $this>
*/
public function daemons(): HasMany
{
return $this->queues()->whereNull('site_id');
return $this->workers()->whereNull('site_id');
}
/**

34
app/Models/Site.php
View File

@ -11,6 +11,7 @@
use App\SSH\Services\PHP\PHP;
use App\SSH\Services\Webserver\Webserver;
use App\Traits\HasProjectThroughServer;
use Database\Factories\SiteFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
@ -44,7 +45,7 @@
* @property Collection<int, Command> $commands
* @property ?GitHook $gitHook
* @property ?DeploymentScript $deploymentScript
* @property Collection<int, Queue> $queues
* @property Collection<int, Worker> $workers
* @property Collection<int, Ssl> $ssls
* @property ?Ssl $activeSsl
* @property string $ssh_key_name
@ -54,7 +55,7 @@
*/
class Site extends AbstractModel
{
/** @use HasFactory<\Database\Factories\SiteFactory> */
/** @use HasFactory<SiteFactory> */
use HasFactory;
use HasProjectThroughServer;
@ -105,9 +106,9 @@ public static function boot(): void
parent::boot();
static::deleting(function (Site $site): void {
$site->queues()->each(function ($queue): void {
/** @var Queue $queue */
$queue->delete();
$site->workers()->each(function ($worker): void {
/** @var Worker $worker */
$worker->delete();
});
$site->ssls()->delete();
$site->deployments()->delete();
@ -186,11 +187,11 @@ public function deploymentScript(): HasOne
}
/**
* @return HasMany<Queue, covariant $this>
* @return HasMany<Worker, covariant $this>
*/
public function queues(): HasMany
public function workers(): HasMany
{
return $this->hasMany(Queue::class);
return $this->hasMany(Worker::class);
}
/**
@ -401,4 +402,21 @@ public function loadBalancerServers(): HasMany
{
return $this->hasMany(LoadBalancerServer::class, 'load_balancer_id');
}
/**
* @return array<string>
*/
public function getSshUsers(): array
{
$users = [
'root',
$this->server->getSshUser(),
];
if ($this->isIsolated()) {
$users[] = $this->user;
}
return $users;
}
}

30
app/Models/Queue.php → app/Models/Worker.php
View File

@ -2,9 +2,9 @@
namespace App\Models;
use App\Enums\QueueStatus;
use App\Enums\WorkerStatus;
use App\SSH\Services\ProcessManager\ProcessManager;
use Database\Factories\QueueFactory;
use Database\Factories\WorkerFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Facades\Log;
@ -24,9 +24,9 @@
* @property Server $server
* @property Site $site
*/
class Queue extends AbstractModel
class Worker extends AbstractModel
{
/** @use HasFactory<QueueFactory> */
/** @use HasFactory<WorkerFactory> */
use HasFactory;
protected $fillable = [
@ -55,28 +55,28 @@ class Queue extends AbstractModel
* @var array<string, string>
*/
public static array $statusColors = [
QueueStatus::RUNNING => 'success',
QueueStatus::CREATING => 'warning',
QueueStatus::DELETING => 'warning',
QueueStatus::FAILED => 'danger',
QueueStatus::STARTING => 'warning',
QueueStatus::STOPPING => 'warning',
QueueStatus::RESTARTING => 'warning',
QueueStatus::STOPPED => 'gray',
WorkerStatus::RUNNING => 'success',
WorkerStatus::CREATING => 'warning',
WorkerStatus::DELETING => 'warning',
WorkerStatus::FAILED => 'danger',
WorkerStatus::STARTING => 'warning',
WorkerStatus::STOPPING => 'warning',
WorkerStatus::RESTARTING => 'warning',
WorkerStatus::STOPPED => 'gray',
];
public static function boot(): void
{
parent::boot();
static::deleting(function (Queue $queue): void {
static::deleting(function (Worker $worker): void {
try {
/** @var Service $service */
$service = $queue->server->processManager();
$service = $worker->server->processManager();
/** @var ProcessManager $handler */
$handler = $service->handler();
$handler->delete($queue->id, $queue->site_id);
$handler->delete($worker->id, $worker->site_id);
} catch (Throwable $e) {
Log::error($e);
}

61
app/Policies/QueuePolicy.php
View File

@ -1,61 +0,0 @@
<?php
namespace App\Policies;
use App\Enums\SiteFeature;
use App\Models\Queue;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
class QueuePolicy
{
use HandlesAuthorization;
public function viewAny(User $user, Site $site, Server $server): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$server->isReady() &&
$site->hasFeature(SiteFeature::QUEUES) &&
$site->isReady();
}
public function view(User $user, Queue $queue, Site $site, Server $server): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$site->server_id === $server->id &&
$server->isReady() &&
$site->isReady() &&
$site->hasFeature(SiteFeature::QUEUES) &&
$queue->site_id === $site->id;
}
public function create(User $user, Site $site, Server $server): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$server->isReady() &&
$site->hasFeature(SiteFeature::QUEUES) &&
$site->isReady();
}
public function update(User $user, Queue $queue, Site $site, Server $server): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$site->server_id === $server->id &&
$server->isReady() &&
$site->isReady() &&
$site->hasFeature(SiteFeature::QUEUES) &&
$queue->site_id === $site->id;
}
public function delete(User $user, Queue $queue, Site $site, Server $server): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$site->server_id === $server->id &&
$server->isReady() &&
$site->isReady() &&
$site->hasFeature(SiteFeature::QUEUES) &&
$queue->site_id === $site->id;
}
}

86
app/Policies/WorkerPolicy.php Normal file
View File

@ -0,0 +1,86 @@
<?php
namespace App\Policies;
use App\Enums\SiteFeature;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use App\Models\Worker;
use Illuminate\Auth\Access\HandlesAuthorization;
class WorkerPolicy
{
use HandlesAuthorization;
public function viewAny(User $user, Server $server, ?Site $site = null): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$server->isReady() &&
(
! $site instanceof \App\Models\Site ||
(
$site->hasFeature(SiteFeature::WORKERS) &&
$site->isReady()
)
);
}
public function view(User $user, Worker $worker, Server $server, ?Site $site = null): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$site->server_id === $server->id &&
$server->isReady() &&
(
! $site instanceof \App\Models\Site ||
(
$site->hasFeature(SiteFeature::WORKERS) &&
$site->isReady() &&
$worker->site_id === $site->id
)
);
}
public function create(User $user, Server $server, ?Site $site = null): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$server->isReady() &&
(
! $site instanceof \App\Models\Site ||
(
$site->hasFeature(SiteFeature::WORKERS) &&
$site->isReady()
)
);
}
public function update(User $user, Worker $worker, Server $server, ?Site $site = null): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$site->server_id === $server->id &&
$server->isReady() &&
(
! $site instanceof \App\Models\Site ||
(
$site->hasFeature(SiteFeature::WORKERS) &&
$site->isReady() &&
$worker->site_id === $site->id
)
);
}
public function delete(User $user, Worker $worker, Server $server, ?Site $site = null): bool
{
return ($user->isAdmin() || $server->project->users->contains($user)) &&
$site->server_id === $server->id &&
$server->isReady() &&
(
! $site instanceof \App\Models\Site ||
(
$site->hasFeature(SiteFeature::WORKERS) &&
$site->isReady() &&
$worker->site_id === $site->id
)
);
}
}

14
app/SSH/Services/Database/AbstractDatabase.php
View File

@ -286,7 +286,7 @@ public function getCharsets(): array
}
}
foreach ($results as $charset => $value) {
foreach (array_keys($results) as $charset) {
$results[$charset]['list'] = $charsetCollations[$charset];
}
@ -310,9 +310,7 @@ public function getDatabases(): array
$databases = $this->tableToArray($data);
return array_values(array_filter($databases, function ($database) {
return ! in_array($database[0], $this->systemDbs);
}));
return array_values(array_filter($databases, fn ($database): bool => ! in_array($database[0], $this->systemDbs)));
}
/**
@ -327,15 +325,11 @@ public function getUsers(): array
$users = $this->tableToArray($data);
$users = array_values(array_filter($users, function ($users) {
return ! in_array($users[0], $this->systemUsers);
}));
$users = array_values(array_filter($users, fn ($users): bool => ! in_array($users[0], $this->systemUsers)));
foreach ($users as $key => $user) {
$databases = explode(',', $user[2]);
$databases = array_values(array_filter($databases, function ($database) {
return ! in_array($database, $this->systemDbs);
}));
$databases = array_values(array_filter($databases, fn ($database): bool => ! in_array($database, $this->systemDbs)));
$users[$key][2] = implode(',', $databases);
}

6
app/SSH/Services/ProcessManager/AbstractProcessManager.php
View File

@ -27,9 +27,9 @@ public function deletionRules(): array
return [
'service' => [
function (string $attribute, mixed $value, Closure $fail): void {
$hasQueue = $this->service->server->queues()->exists();
if ($hasQueue) {
$fail('You have queue(s) on the server.');
$hasWorker = $this->service->server->workers()->exists();
if ($hasWorker) {
$fail('You have worker(s) on the server.');
}
},
],

4
app/SiteTypes/Laravel.php
View File

@ -34,9 +34,9 @@ public function baseCommands(): array
'name' => 'Clear Application Cache Only',
'command' => 'php artisan cache:clear',
],
// Queue Commands
// Worker Commands
[
'name' => 'Restart Queue Workers',
'name' => 'Restart Workers',
'command' => 'php artisan queue:restart',
],
[

2
app/SiteTypes/PHPBlank.php
View File

@ -15,7 +15,7 @@ public function supportedFeatures(): array
SiteFeature::COMMANDS,
SiteFeature::ENV,
SiteFeature::SSL,
SiteFeature::QUEUES,
SiteFeature::WORKERS,
];
}

2
app/SiteTypes/PHPSite.php
View File

@ -23,7 +23,7 @@ public function supportedFeatures(): array
SiteFeature::COMMANDS,
SiteFeature::ENV,
SiteFeature::SSL,
SiteFeature::QUEUES,
SiteFeature::WORKERS,
];
}

4
app/Web/Pages/Servers/Databases/Index.php
View File

@ -94,8 +94,8 @@ protected function getHeaderActions(): array
->requiresConfirmation()
->modalDescription('This will create databases that exist on the server but not in Vito.')
->modalSubmitActionLabel('Sync')
->action(function () {
run_action($this, function () {
->action(function (): void {
run_action($this, function (): void {
app(SyncDatabases::class)->sync($this->server);
$this->dispatch('$refresh');

4
app/Web/Pages/Servers/Databases/Users.php
View File

@ -38,8 +38,8 @@ protected function getHeaderActions(): array
->requiresConfirmation()
->modalDescription('This will create db users that exist on the server but not in Vito.')
->modalSubmitActionLabel('Sync')
->action(function () {
run_action($this, function () {
->action(function (): void {
run_action($this, function (): void {
app(SyncDatabaseUsers::class)->sync($this->server);
$this->dispatch('$refresh');

9
app/Web/Pages/Servers/Page.php
View File

@ -12,6 +12,7 @@
use App\Models\Site;
use App\Models\SshKey;
use App\Models\User;
use App\Models\Worker;
use App\Web\Components\Page as BasePage;
use App\Web\Pages\Servers\Console\Index as ConsoleIndex;
use App\Web\Pages\Servers\CronJobs\Index as CronJobsIndex;
@ -28,6 +29,7 @@
use App\Web\Pages\Servers\SSHKeys\Index as SshKeysIndex;
use App\Web\Pages\Servers\View as ServerView;
use App\Web\Pages\Servers\Widgets\ServerSummary;
use App\Web\Pages\Servers\Workers\Index as WorkersIndex;
use Filament\Navigation\NavigationItem;
abstract class Page extends BasePage
@ -99,6 +101,13 @@ public function getSubNavigation(): array
->url(CronJobsIndex::getUrl(parameters: ['server' => $this->server]));
}
if ($user->can('viewAny', [Worker::class, $this->server])) {
$items[] = NavigationItem::make(WorkersIndex::getNavigationLabel())
->icon('heroicon-o-queue-list')
->isActiveWhen(fn () => request()->routeIs(WorkersIndex::getRouteName().'*'))
->url(WorkersIndex::getUrl(parameters: ['server' => $this->server]));
}
if ($user->can('viewAnyServer', [SshKey::class, $this->server])) {
$items[] = NavigationItem::make(SshKeysIndex::getNavigationLabel())
->icon('heroicon-o-key')

10
app/Web/Pages/Servers/Sites/Page.php
View File

@ -2,11 +2,11 @@
namespace App\Web\Pages\Servers\Sites;
use App\Models\Queue;
use App\Models\ServerLog;
use App\Models\Site;
use App\Models\Ssl;
use App\Models\User;
use App\Models\Worker;
use App\Web\Contracts\HasSecondSubNav;
use App\Web\Pages\Servers\Page as BasePage;
use App\Web\Pages\Servers\Sites\Widgets\SiteSummary;
@ -45,11 +45,11 @@ public function getSecondSubNavigation(): array
]));
}
if ($user->can('viewAny', [Queue::class, $this->site, $this->server])) {
$items[] = NavigationItem::make(Pages\Queues\Index::getNavigationLabel())
if ($user->can('viewAny', [Worker::class, $this->server, $this->site])) {
$items[] = NavigationItem::make(Pages\Workers\Index::getNavigationLabel())
->icon('heroicon-o-queue-list')
->isActiveWhen(fn () => request()->routeIs(Pages\Queues\Index::getRouteName()))
->url(Pages\Queues\Index::getUrl(parameters: [
->isActiveWhen(fn () => request()->routeIs(Pages\Workers\Index::getRouteName()))
->url(Pages\Workers\Index::getUrl(parameters: [
'server' => $this->server,
'site' => $this->site,
]));

79
app/Web/Pages/Servers/Sites/Pages/Queues/Index.php
View File

@ -1,79 +0,0 @@
<?php
namespace App\Web\Pages\Servers\Sites\Pages\Queues;
use App\Actions\Queue\CreateQueue;
use App\Models\Queue;
use App\Web\Pages\Servers\Sites\Page;
use Filament\Actions\Action;
use Filament\Actions\CreateAction;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Support\Enums\MaxWidth;
class Index extends Page
{
protected static ?string $slug = 'servers/{server}/sites/{site}/queues';
protected static ?string $title = 'Queues';
public function mount(): void
{
$this->authorize('viewAny', [Queue::class, $this->site, $this->server]);
}
public function getWidgets(): array
{
return [
[Widgets\QueuesList::class, ['site' => $this->site]],
];
}
protected function getHeaderActions(): array
{
return [
Action::make('read-the-docs')
->label('Read the Docs')
->icon('heroicon-o-document-text')
->color('gray')
->url('https://vitodeploy.com/sites/queues')
->openUrlInNewTab(),
CreateAction::make('create')
->icon('heroicon-o-plus')
->createAnother(false)
->modalWidth(MaxWidth::ExtraLarge)
->label('New Queue')
->form([
TextInput::make('command')
->rules(CreateQueue::rules($this->site)['command'])
->helperText('Example: php /home/vito/your-site/artisan queue:work'),
Select::make('user')
->rules(fn (callable $get) => CreateQueue::rules($this->site)['user'])
->options([
'root' => 'root',
$this->site->user => $this->site->user,
]),
TextInput::make('numprocs')
->default(1)
->rules(CreateQueue::rules($this->site)['numprocs'])
->helperText('Number of processes'),
Grid::make()
->schema([
Checkbox::make('auto_start')
->default(false),
Checkbox::make('auto_restart')
->default(false),
]),
])
->using(function (array $data): void {
run_action($this, function () use ($data): void {
app(CreateQueue::class)->create($this->site, $data);
$this->dispatch('$refresh');
});
}),
];
}
}

53
app/Web/Pages/Servers/Sites/Pages/Workers/Index.php Normal file
View File

@ -0,0 +1,53 @@
<?php
namespace App\Web\Pages\Servers\Sites\Pages\Workers;
use App\Models\Worker;
use App\Web\Pages\Servers\Sites\Page;
use App\Web\Pages\Servers\Workers\Actions\Create;
use Filament\Actions\Action;
use Filament\Actions\CreateAction;
use Filament\Support\Enums\MaxWidth;
class Index extends Page
{
protected static ?string $slug = 'servers/{server}/sites/{site}/workers';
protected static ?string $title = 'Workers';
public function mount(): void
{
$this->authorize('viewAny', [Worker::class, $this->server, $this->site]);
}
public function getWidgets(): array
{
return [
[Widgets\WorkersList::class, [
'server' => $this->server,
'site' => $this->site,
]],
];
}
protected function getHeaderActions(): array
{
return [
Action::make('read-the-docs')
->label('Read the Docs')
->icon('heroicon-o-document-text')
->color('gray')
->url('https://vitodeploy.com/servers/workers')
->openUrlInNewTab(),
CreateAction::make('create')
->icon('heroicon-o-plus')
->createAnother(false)
->modalWidth(MaxWidth::ExtraLarge)
->label('New Worker')
->form(Create::form($this->server, $this->site))
->using(fn (array $data) => run_action($this, function () use ($data): void {
Create::action($this, $data, $this->server, $this->site);
})),
];
}
}

5
app/Web/Pages/Servers/Sites/Pages/Workers/Widgets/WorkersList.php Normal file
View File

@ -0,0 +1,5 @@
<?php
namespace App\Web\Pages\Servers\Sites\Pages\Workers\Widgets;
class WorkersList extends \App\Web\Pages\Servers\Workers\Widgets\WorkersList {}

55
app/Web/Pages/Servers/Workers/Actions/Create.php Normal file
View File

@ -0,0 +1,55 @@
<?php
namespace App\Web\Pages\Servers\Workers\Actions;
use App\Actions\Worker\CreateWorker;
use App\Models\Server;
use App\Models\Site;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Livewire\Component;
class Create
{
/**
* @return array<int, mixed>
*/
public static function form(Server $server, ?Site $site = null): array
{
return [
TextInput::make('command')
->rules(CreateWorker::rules($server, $site)['command'])
->helperText('Example: php /home/vito/your-site/artisan queue:work'),
Select::make('user')
->rules(fn (callable $get) => CreateWorker::rules($server, $site)['user'])
->options($server->getSshUsers()),
TextInput::make('numprocs')
->default(1)
->rules(CreateWorker::rules($server, $site)['numprocs'])
->helperText('Number of processes'),
Grid::make()
->schema([
Checkbox::make('auto_start')
->default(false),
Checkbox::make('auto_restart')
->default(false),
]),
];
}
/**
* @param array<string, mixed> $data
*/
public static function action(Component $component, array $data, Server $server, ?Site $site = null): void
{
app(CreateWorker::class)->create(
$server,
$data,
$site
);
$component->dispatch('$refresh');
}
}

50
app/Web/Pages/Servers/Workers/Index.php Normal file
View File

@ -0,0 +1,50 @@
<?php
namespace App\Web\Pages\Servers\Workers;
use App\Models\Worker;
use App\Web\Pages\Servers\Page;
use App\Web\Pages\Servers\Workers\Actions\Create;
use Filament\Actions\Action;
use Filament\Actions\CreateAction;
use Filament\Support\Enums\MaxWidth;
class Index extends Page
{
protected static ?string $slug = 'servers/{server}/workers';
protected static ?string $title = 'Workers';
public function mount(): void
{
$this->authorize('viewAny', [Worker::class, $this->server]);
}
public function getWidgets(): array
{
return [
[Widgets\WorkersList::class, ['server' => $this->server]],
];
}
protected function getHeaderActions(): array
{
return [
Action::make('read-the-docs')
->label('Read the Docs')
->icon('heroicon-o-document-text')
->color('gray')
->url('https://vitodeploy.com/servers/workers')
->openUrlInNewTab(),
CreateAction::make('create')
->icon('heroicon-o-plus')
->createAnother(false)
->modalWidth(MaxWidth::ExtraLarge)
->label('New Worker')
->form(Create::form($this->server))
->using(fn (array $data) => run_action($this, function () use ($data): void {
Create::action($this, $data, $this->server);
})),
];
}
}

71
app/Web/Pages/Servers/Sites/Pages/Queues/Widgets/QueuesList.php → app/Web/Pages/Servers/Workers/Widgets/WorkersList.php
View File

@ -1,14 +1,15 @@
<?php
namespace App\Web\Pages\Servers\Sites\Pages\Queues\Widgets;
namespace App\Web\Pages\Servers\Workers\Widgets;
use App\Actions\Queue\DeleteQueue;
use App\Actions\Queue\EditQueue;
use App\Actions\Queue\GetQueueLogs;
use App\Actions\Queue\ManageQueue;
use App\Models\Queue;
use App\Actions\Worker\DeleteWorker;
use App\Actions\Worker\EditWorker;
use App\Actions\Worker\GetWorkerLogs;
use App\Actions\Worker\ManageWorker;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use App\Models\Worker;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Select;
@ -24,9 +25,11 @@
use Illuminate\Database\Eloquent\Builder;
use Illuminate\View\ComponentAttributeBag;
class QueuesList extends Widget
class WorkersList extends Widget
{
public Site $site;
public Server $server;
public ?Site $site = null;
/**
* @var array<string>
@ -34,11 +37,17 @@ class QueuesList extends Widget
protected $listeners = ['$refresh'];
/**
* @return Builder<Queue>
* @return Builder<Worker>
*/
protected function getTableQuery(): Builder
{
return Queue::query()->where('site_id', $this->site->id);
return Worker::query()
->where('server_id', $this->server->id)
->where(function (Builder $query): void {
if ($this->site instanceof \App\Models\Site) {
$query->where('site_id', $this->site->id);
}
});
}
protected function getTableColumns(): array
@ -47,16 +56,16 @@ protected function getTableColumns(): array
TextColumn::make('command')
->limit(20)
->copyable()
->tooltip(fn (Queue $record) => $record->command)
->tooltip(fn (Worker $record) => $record->command)
->searchable()
->sortable(),
TextColumn::make('created_at')
->formatStateUsing(fn (Queue $record) => $record->created_at_by_timezone)
->formatStateUsing(fn (Worker $record) => $record->created_at_by_timezone)
->sortable(),
TextColumn::make('status')
->label('Status')
->badge()
->color(fn (Queue $record) => Queue::$statusColors[$record->status])
->color(fn (Worker $record) => Worker::$statusColors[$record->status])
->searchable()
->sortable(),
];
@ -86,12 +95,12 @@ private function operationAction(string $type, string $icon): Action
$user = auth()->user();
return Action::make($type)
->authorize(fn (Queue $record) => $user->can('update', [$record, $this->site, $this->site->server]))
->label(ucfirst($type).' queue')
->authorize(fn (Worker $record) => $user->can('update', [$record, $this->server, $this->site]))
->label(ucfirst($type).' worker')
->icon($icon)
->action(function (Queue $record) use ($type): void {
->action(function (Worker $record) use ($type): void {
run_action($this, function () use ($record, $type): void {
app(ManageQueue::class)->$type($record);
app(ManageWorker::class)->$type($record);
$this->dispatch('$refresh');
});
});
@ -104,10 +113,10 @@ private function logsAction(): Action
return Action::make('logs')
->icon('heroicon-o-eye')
->authorize(fn (Queue $record) => $user->can('view', [$record, $this->site, $this->site->server]))
->authorize(fn (Worker $record) => $user->can('view', [$record, $this->server, $this->site]))
->modalHeading('View Log')
->modalContent(fn (Queue $record) => view('components.console-view', [
'slot' => app(GetQueueLogs::class)->getLogs($record),
->modalContent(fn (Worker $record) => view('components.console-view', [
'slot' => app(GetWorkerLogs::class)->getLogs($record),
'attributes' => new ComponentAttributeBag,
]))
->modalSubmitAction(false)
@ -121,9 +130,9 @@ private function editAction(): Action
return EditAction::make('edit')
->icon('heroicon-o-pencil-square')
->authorize(fn (Queue $record) => $user->can('update', [$record, $this->site, $this->site->server]))
->authorize(fn (Worker $record) => $user->can('update', [$record, $this->server, $this->site]))
->modalWidth(MaxWidth::ExtraLarge)
->fillForm(fn (Queue $record): array => [
->fillForm(fn (Worker $record): array => [
'command' => $record->command,
'user' => $record->user,
'numprocs' => $record->numprocs,
@ -132,17 +141,17 @@ private function editAction(): Action
])
->form([
TextInput::make('command')
->rules(EditQueue::rules($this->site->server)['command'])
->rules(EditWorker::rules($this->server, $this->site)['command'])
->helperText('Example: php /home/vito/your-site/artisan queue:work'),
Select::make('user')
->rules(fn (callable $get) => EditQueue::rules($this->site->server)['user'])
->rules(fn (callable $get) => EditWorker::rules($this->server, $this->site)['user'])
->options([
'vito' => $this->site->server->ssh_user,
'vito' => $this->server->ssh_user,
'root' => 'root',
]),
TextInput::make('numprocs')
->default(1)
->rules(EditQueue::rules($this->site->server)['numprocs'])
->rules(EditWorker::rules($this->server, $this->site)['numprocs'])
->helperText('Number of processes'),
Grid::make()
->schema([
@ -152,9 +161,9 @@ private function editAction(): Action
->default(false),
]),
])
->using(function (Queue $record, array $data): void {
->using(function (Worker $record, array $data): void {
run_action($this, function () use ($record, $data): void {
app(EditQueue::class)->edit($record, $data);
app(EditWorker::class)->edit($record, $data);
$this->dispatch('$refresh');
});
});
@ -167,10 +176,10 @@ private function deleteAction(): Action
return DeleteAction::make('delete')
->icon('heroicon-o-trash')
->authorize(fn (Queue $record) => $user->can('delete', [$record, $this->site, $this->site->server]))
->using(function (Queue $record): void {
->authorize(fn (Worker $record) => $user->can('delete', [$record, $this->server, $this->site]))
->using(function (Worker $record): void {
run_action($this, function () use ($record): void {
app(DeleteQueue::class)->delete($record);
app(DeleteWorker::class)->delete($record);
$this->dispatch('$refresh');
});
});

12
database/factories/QueueFactory.php → database/factories/WorkerFactory.php
View File

@ -2,16 +2,16 @@
namespace Database\Factories;
use App\Enums\QueueStatus;
use App\Models\Queue;
use App\Enums\WorkerStatus;
use App\Models\Worker;
use Illuminate\Database\Eloquent\Factories\Factory;
/**
* @extends Factory<\App\Models\Queue>
* @extends Factory<Worker>
*/
class QueueFactory extends Factory
class WorkerFactory extends Factory
{
protected $model = Queue::class;
protected $model = Worker::class;
public function definition(): array
{
@ -23,7 +23,7 @@ public function definition(): array
'numprocs' => 1,
'redirect_stderr' => 1,
'stdout_logfile' => 'file.log',
'status' => QueueStatus::CREATING,
'status' => WorkerStatus::CREATING,
];
}
}

21
database/migrations/2025_03_16_081225_rename_queues_to_workers.php Normal file
View File

@ -0,0 +1,21 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::rename('queues', 'workers');
Schema::table('workers', function (Blueprint $table): void {
$table->unsignedInteger('site_id')->nullable()->change();
});
}
public function down(): void
{
Schema::rename('workers', 'queues');
}
};

8
database/seeders/SitesSeeder.php
View File

@ -2,15 +2,15 @@
namespace Database\Seeders;
use App\Enums\QueueStatus;
use App\Enums\SiteType;
use App\Enums\SslStatus;
use App\Enums\SslType;
use App\Models\Queue;
use App\Enums\WorkerStatus;
use App\Models\Server;
use App\Models\Site;
use App\Models\SourceControl;
use App\Models\Ssl;
use App\Models\Worker;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Seeder;
@ -36,10 +36,10 @@ public function run(): void
'aliases' => ['www.'.$server->project->name.'.com'],
]);
$app->tags()->attach($server->tags()->first());
Queue::factory()->create([
Worker::factory()->create([
'site_id' => $app->id,
'command' => 'php artisan queue:work',
'status' => QueueStatus::RUNNING,
'status' => WorkerStatus::RUNNING,
]);
Ssl::factory()->create([
'site_id' => $app->id,

1
routes/api.php
View File

@ -1 +0,0 @@
<?php

1
routes/console.php
View File

@ -1 +0,0 @@
<?php

1
routes/web.php
View File

@ -1 +0,0 @@
<?php

108
tests/Feature/QueuesTest.php → tests/Feature/WorkersTest.php
View File

@ -2,25 +2,25 @@
namespace Tests\Feature;
use App\Enums\QueueStatus;
use App\Enums\WorkerStatus;
use App\Facades\SSH;
use App\Models\Queue;
use App\Models\Site;
use App\Web\Pages\Servers\Sites\Pages\Queues\Index;
use App\Web\Pages\Servers\Sites\Pages\Queues\Widgets\QueuesList;
use App\Models\Worker;
use App\Web\Pages\Servers\Sites\Pages\Workers\Index;
use App\Web\Pages\Servers\Sites\Pages\Workers\Widgets\WorkersList;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Livewire\Livewire;
use Tests\TestCase;
class QueuesTest extends TestCase
class WorkersTest extends TestCase
{
use RefreshDatabase;
public function test_see_queues()
public function test_see_workers(): void
{
$this->actingAs($this->user);
$queue = Queue::factory()->create([
$worker = Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
]);
@ -32,33 +32,33 @@ public function test_see_queues()
])
)
->assertSuccessful()
->assertSee($queue->command);
->assertSee($worker->command);
}
public function test_delete_queue()
public function test_delete_worker(): void
{
SSH::fake();
$this->actingAs($this->user);
$queue = Queue::factory()->create([
$worker = Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
]);
Livewire::test(QueuesList::class, [
Livewire::test(WorkersList::class, [
'server' => $this->server,
'site' => $this->site,
])
->callTableAction('delete', $queue->id)
->callTableAction('delete', $worker->id)
->assertSuccessful();
$this->assertDatabaseMissing('queues', [
'id' => $queue->id,
$this->assertDatabaseMissing('workers', [
'id' => $worker->id,
]);
}
public function test_create_queue()
public function test_create_worker(): void
{
SSH::fake();
@ -69,7 +69,7 @@ public function test_create_queue()
'site' => $this->site,
])
->callAction('create', [
'command' => 'php artisan queue:work',
'command' => 'php artisan worker:work',
'user' => 'vito',
'auto_start' => 1,
'auto_restart' => 1,
@ -77,19 +77,19 @@ public function test_create_queue()
])
->assertSuccessful();
$this->assertDatabaseHas('queues', [
$this->assertDatabaseHas('workers', [
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'command' => 'php artisan queue:work',
'command' => 'php artisan worker:work',
'user' => 'vito',
'auto_start' => 1,
'auto_restart' => 1,
'numprocs' => 1,
'status' => QueueStatus::RUNNING,
'status' => WorkerStatus::RUNNING,
]);
}
public function test_create_queue_as_isolated_user(): void
public function test_create_worker_as_isolated_user(): void
{
SSH::fake();
@ -111,7 +111,7 @@ public function test_create_queue_as_isolated_user(): void
])
->assertSuccessful();
$this->assertDatabaseHas('queues', [
$this->assertDatabaseHas('workers', [
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'command' => 'php artisan queue:work',
@ -119,11 +119,11 @@ public function test_create_queue_as_isolated_user(): void
'auto_start' => 1,
'auto_restart' => 1,
'numprocs' => 1,
'status' => QueueStatus::RUNNING,
'status' => WorkerStatus::RUNNING,
]);
}
public function test_cannot_create_queue_as_invalid_user(): void
public function test_cannot_create_worker_as_invalid_user(): void
{
SSH::fake();
@ -142,14 +142,14 @@ public function test_cannot_create_queue_as_invalid_user(): void
])
->assertHasActionErrors();
$this->assertDatabaseMissing('queues', [
$this->assertDatabaseMissing('workers', [
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'user' => 'example',
]);
}
public function test_cannot_create_queue_on_another_sites_user(): void
public function test_cannot_create_worker_on_another_sites_user(): void
{
SSH::fake();
@ -173,85 +173,85 @@ public function test_cannot_create_queue_on_another_sites_user(): void
])
->assertHasActionErrors();
$this->assertDatabaseMissing('queues', [
$this->assertDatabaseMissing('workers', [
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'user' => 'example',
]);
}
public function test_start_queue(): void
public function test_start_worker(): void
{
SSH::fake();
$this->actingAs($this->user);
$queue = Queue::factory()->create([
$worker = Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'status' => QueueStatus::STOPPED,
'status' => WorkerStatus::STOPPED,
]);
Livewire::test(QueuesList::class, [
Livewire::test(WorkersList::class, [
'server' => $this->server,
'site' => $this->site,
])
->callTableAction('start', $queue->id)
->callTableAction('start', $worker->id)
->assertSuccessful();
$this->assertDatabaseHas('queues', [
'id' => $queue->id,
'status' => QueueStatus::RUNNING,
$this->assertDatabaseHas('workers', [
'id' => $worker->id,
'status' => WorkerStatus::RUNNING,
]);
}
public function test_stop_queue(): void
public function test_stop_worker(): void
{
SSH::fake();
$this->actingAs($this->user);
$queue = Queue::factory()->create([
$worker = Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'status' => QueueStatus::RUNNING,
'status' => WorkerStatus::RUNNING,
]);
Livewire::test(QueuesList::class, [
Livewire::test(WorkersList::class, [
'server' => $this->server,
'site' => $this->site,
])
->callTableAction('stop', $queue->id)
->callTableAction('stop', $worker->id)
->assertSuccessful();
$this->assertDatabaseHas('queues', [
'id' => $queue->id,
'status' => QueueStatus::STOPPED,
$this->assertDatabaseHas('workers', [
'id' => $worker->id,
'status' => WorkerStatus::STOPPED,
]);
}
public function test_restart_queue(): void
public function test_restart_worker(): void
{
SSH::fake();
$this->actingAs($this->user);
$queue = Queue::factory()->create([
$worker = Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'status' => QueueStatus::RUNNING,
'status' => WorkerStatus::RUNNING,
]);
Livewire::test(QueuesList::class, [
Livewire::test(WorkersList::class, [
'server' => $this->server,
'site' => $this->site,
])
->callTableAction('restart', $queue->id)
->callTableAction('restart', $worker->id)
->assertSuccessful();
$this->assertDatabaseHas('queues', [
'id' => $queue->id,
'status' => QueueStatus::RUNNING,
$this->assertDatabaseHas('workers', [
'id' => $worker->id,
'status' => WorkerStatus::RUNNING,
]);
}
@ -261,17 +261,17 @@ public function test_show_logs(): void
$this->actingAs($this->user);
$queue = Queue::factory()->create([
$worker = Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
'status' => QueueStatus::RUNNING,
'status' => WorkerStatus::RUNNING,
]);
Livewire::test(QueuesList::class, [
Livewire::test(WorkersList::class, [
'server' => $this->server,
'site' => $this->site,
])
->callTableAction('logs', $queue->id)
->callTableAction('logs', $worker->id)
->assertSuccessful();
}
}

4
tests/Unit/Actions/Service/UninstallTest.php
View File

@ -6,8 +6,8 @@
use App\Enums\ServiceStatus;
use App\Facades\SSH;
use App\Models\Database;
use App\Models\Queue;
use App\Models\Service;
use App\Models\Worker;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Validation\ValidationException;
use Tests\TestCase;
@ -74,7 +74,7 @@ public function test_cannot_uninstall_supervisor(): void
{
SSH::fake();
Queue::factory()->create([
Worker::factory()->create([
'server_id' => $this->server->id,
'site_id' => $this->site->id,
]);