direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-07-02 14:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix create queue with root user (#409)

Browse Source 
* fix create queue with root user

* fix

* fix queues for root user
This commit is contained in:
Saeed Vaziry
2024-12-30 02:33:00 -08:00
committed by GitHub
parent dfdd50beb7
commit 8b86ff23c9
9 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/Queue.php
View File

@ -5,6 +5,8 @@
use App\Enums\QueueStatus;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Facades\Log;
use Throwable;
/**
* @property int $server_id
@ -62,7 +64,11 @@ public static function boot(): void
parent::boot();
static::deleting(function (Queue $queue) {
$queue->server->processManager()->handler()->delete($queue->id, $queue->site_id);
try {
$queue->server->processManager()->handler()->delete($queue->id, $queue->site_id);
} catch (Throwable $e) {
Log::error($e);
}
});
}
@ -89,6 +95,10 @@ public function site(): BelongsTo
public function getLogDirectory(): string
{
if ($this->user === 'root') {
return '/root/.logs/workers';
}
return '/home/'.$this->user.'/.logs/workers';
}

6
app/Models/Server.php
View File

@ -121,8 +121,12 @@ public static function boot(): void
DB::beginTransaction();
try {
$server->sites()->each(function (Site $site) {
$site->delete();
$site->queues()->delete();
$site->ssls()->delete();
$site->deployments()->delete();
$site->deploymentScript()->delete();
});
$server->sites()->delete();
$server->logs()->each(function (ServerLog $log) {
$log->delete();
});