fixes
This commit is contained in:
parent
3f8514050e
commit
2c6ece62bb
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Jobs;
|
namespace App\Jobs;
|
||||||
|
|
||||||
|
use App\Actions\Database\StopDatabase;
|
||||||
use App\Models\S3Storage;
|
use App\Models\S3Storage;
|
||||||
use App\Models\ScheduledDatabaseBackup;
|
use App\Models\ScheduledDatabaseBackup;
|
||||||
use App\Models\ScheduledDatabaseBackupExecution;
|
use App\Models\ScheduledDatabaseBackupExecution;
|
||||||
@ -22,6 +23,7 @@ use Illuminate\Queue\InteractsWithQueue;
|
|||||||
use Illuminate\Queue\Middleware\WithoutOverlapping;
|
use Illuminate\Queue\Middleware\WithoutOverlapping;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
|
class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
|
||||||
{
|
{
|
||||||
@ -64,6 +66,14 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
|
|||||||
public function handle(): void
|
public function handle(): void
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
// Check if team is exists
|
||||||
|
if (is_null($this->team)) {
|
||||||
|
$this->backup->update(['status' => 'failed']);
|
||||||
|
StopDatabase::run($this->database);
|
||||||
|
$this->database->delete();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$status = Str::of(data_get($this->database, 'status'));
|
$status = Str::of(data_get($this->database, 'status'));
|
||||||
if (!$status->startsWith('running') && $this->database->id !== 0) {
|
if (!$status->startsWith('running') && $this->database->id !== 0) {
|
||||||
ray('database not running');
|
ray('database not running');
|
||||||
|
@ -32,11 +32,11 @@ class StandaloneMongodb extends BaseModel
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
static::deleting(function ($database) {
|
static::deleting(function ($database) {
|
||||||
$database->scheduledBackups()->delete();
|
|
||||||
$storages = $database->persistentStorages()->get();
|
$storages = $database->persistentStorages()->get();
|
||||||
foreach ($storages as $storage) {
|
foreach ($storages as $storage) {
|
||||||
instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
|
instant_remote_process(["docker volume rm -f $storage->name"], $database->destination->server, false);
|
||||||
}
|
}
|
||||||
|
$database->scheduledBackups()->delete();
|
||||||
$database->persistentStorages()->delete();
|
$database->persistentStorages()->delete();
|
||||||
$database->environment_variables()->delete();
|
$database->environment_variables()->delete();
|
||||||
});
|
});
|
||||||
|
@ -45,7 +45,7 @@ services:
|
|||||||
- /data/coolify/_volumes/redis/:/data
|
- /data/coolify/_volumes/redis/:/data
|
||||||
# - coolify-redis-data-dev:/data
|
# - coolify-redis-data-dev:/data
|
||||||
vite:
|
vite:
|
||||||
image: node:19
|
image: node:20
|
||||||
working_dir: /var/www/html
|
working_dir: /var/www/html
|
||||||
ports:
|
ports:
|
||||||
- "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
|
- "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
|
||||||
|
@ -11,8 +11,7 @@
|
|||||||
<div>This is the default team. You can't delete it.</div>
|
<div>This is the default team. You can't delete it.</div>
|
||||||
@elseif(auth()->user()->teams()->get()->count() === 1)
|
@elseif(auth()->user()->teams()->get()->count() === 1)
|
||||||
<div>You can't delete your last team.</div>
|
<div>You can't delete your last team.</div>
|
||||||
@elseif(currentTeam()->subscription &&
|
@elseif(currentTeam()->subscription && currentTeam()->subscription?->lemon_status !== 'cancelled')
|
||||||
currentTeam()->subscription?->lemon_status !== 'cancelled')
|
|
||||||
<div>Please cancel your subscription before delete this team (Manage My Subscription).</div>
|
<div>Please cancel your subscription before delete this team (Manage My Subscription).</div>
|
||||||
@else
|
@else
|
||||||
@if (currentTeam()->isEmpty())
|
@if (currentTeam()->isEmpty())
|
||||||
@ -23,24 +22,31 @@
|
|||||||
@else
|
@else
|
||||||
<div>
|
<div>
|
||||||
<div class="pb-4">You need to delete the following resources to be able to delete the team:</div>
|
<div class="pb-4">You need to delete the following resources to be able to delete the team:</div>
|
||||||
|
@if (currentTeam()->projects()->count() > 0)
|
||||||
<h4 class="pb-4">Projects:</h4>
|
<h4 class="pb-4">Projects:</h4>
|
||||||
<ul class="pl-8 list-disc">
|
<ul class="pl-8 list-disc">
|
||||||
@foreach (currentTeam()->projects as $resource)
|
@foreach (currentTeam()->projects as $resource)
|
||||||
<li>{{ $resource->name }}</li>
|
<li>{{ $resource->name }}</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
|
@endif
|
||||||
|
@if (currentTeam()->servers()->count() > 0)
|
||||||
<h4 class="py-4">Servers:</h4>
|
<h4 class="py-4">Servers:</h4>
|
||||||
<ul class="pl-8 list-disc">
|
<ul class="pl-8 list-disc">
|
||||||
@foreach (currentTeam()->servers as $resource)
|
@foreach (currentTeam()->servers as $resource)
|
||||||
<li>{{ $resource->name }}</li>
|
<li>{{ $resource->name }}</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
|
@endif
|
||||||
|
@if (currentTeam()->privateKeys()->count() > 0)
|
||||||
<h4 class="py-4">Private Keys:</h4>
|
<h4 class="py-4">Private Keys:</h4>
|
||||||
<ul class="pl-8 list-disc">
|
<ul class="pl-8 list-disc">
|
||||||
@foreach (currentTeam()->privateKeys as $resource)
|
@foreach (currentTeam()->privateKeys as $resource)
|
||||||
<li>{{ $resource->name }}</li>
|
<li>{{ $resource->name }}</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
|
@endif
|
||||||
|
@if (currentTeam()->sources()->count() > 0)
|
||||||
<h4 class="py-4">Sources:</h4>
|
<h4 class="py-4">Sources:</h4>
|
||||||
<ul class="pl-8 list-disc">
|
<ul class="pl-8 list-disc">
|
||||||
@foreach (currentTeam()->sources() as $resource)
|
@foreach (currentTeam()->sources() as $resource)
|
||||||
@ -49,5 +55,6 @@
|
|||||||
</ul>
|
</ul>
|
||||||
@endif
|
@endif
|
||||||
@endif
|
@endif
|
||||||
|
@endif
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user