Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

wip

Browse Source
This commit is contained in:
Andras Bacsai 2023-03-30 21:15:25 +02:00
parent 00d9983655
commit da2deb85c4
7 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Livewire/DeployApplication.php
View File

@ -7,6 +7,7 @@
use App\Models\CoolifyInstanceSettings;
use DateTimeImmutable;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Process;
use Livewire\Component;
use Symfony\Component\Yaml\Yaml;
use Visus\Cuid2\Cuid2;
@ -249,7 +250,20 @@ public function stop()
remoteProcess($command, $destination->server, null, $application);
}
public function checkStatus() {
ContainerStatusJob::dispatch();
$application = Application::where('uuid', $this->application_uuid)->first();
$destination = $application->destination->getMorphClass()::where('id', $application->destination->id)->first();
$private_key_location = savePrivateKey($destination->server);
$ssh_command = generateSshCommand($private_key_location, $destination->server->ip, $destination->server->user, $destination->server->port, "docker ps -a --format '{{.State}}' --filter 'name={$application->uuid}'");
$process = Process::run($ssh_command);
$output = trim($process->output());
if ($output == '') {
$application->status = 'exited';
$application->save();
} else {
$application->status = $output;
$application->save();
}
// ContainerStatusJob::dispatch();
}
}

22
app/Jobs/ContainerStatusJob.php
View File

@ -11,6 +11,7 @@
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Process;
use Tests\Support\Output;
@ -26,16 +27,17 @@ public function __construct()
public function handle(): void
{
try {
$server = Server::all()->where('settings->is_build_server', '=', false)->first();
$servers = Server::all()->reject(fn (Server $server) => $server->settings->is_build_server);
$applications = Application::all();
$not_found_applications = $applications;
$containers = [];
// foreach ($servers as $server) {
$private_key_location = savePrivateKey($server);
$ssh_command = generateSshCommand($private_key_location, $server->ip, $server->user, $server->port, 'docker ps -a -q --format \'{{json .}}\'');
$process = Process::run($ssh_command);
$output = trim($process->output());
$containers = formatDockerCmdOutputToJson($output);
$containers = collect();
foreach ($servers as $server) {
$private_key_location = savePrivateKey($server);
$ssh_command = generateSshCommand($private_key_location, $server->ip, $server->user, $server->port, 'docker ps -a -q --format \'{{json .}}\'');
$process = Process::run($ssh_command);
$output = trim($process->output());
$containers = $containers->concat(formatDockerCmdOutputToJson($output));
}
foreach ($containers as $container) {
$found_application = $applications->filter(function ($value, $key) use ($container) {
return $value->uuid == $container['Names'];
@ -46,13 +48,13 @@ public function handle(): void
});
$found_application->status = $container['State'];
$found_application->save();
// Log::info('Found application: ' . $found_application->uuid . ' settings status to: ' . $found_application->status);
Log::info('Found application: ' . $found_application->uuid . '.Set status to: ' . $found_application->status);
}
}
foreach ($not_found_applications as $not_found_application) {
$not_found_application->status = 'exited';
$not_found_application->save();
// Log::info('Not found application: ' . $not_found_application->uuid . ' settings status to: ' . $not_found_application->status);
Log::info('Not found application: ' . $not_found_application->uuid . '.Set status to: ' . $not_found_application->status);
}
} catch (\Exception $e) {
Log::error($e->getMessage());

1
app/Models/Project.php
View File

@ -4,7 +4,6 @@
class Project extends BaseModel
{
protected $with = ['settings', 'environments'];
protected static function booted()
{
static::created(function ($project) {

2
database/migrations/2023_03_27_081716_create_applications_table.php
View File

@ -52,7 +52,7 @@ public function up(): void
$table->integer('health_check_retries')->default(10);
$table->integer('health_check_start_period')->default(5);
$table->string('status')->default('killed');
$table->string('status')->default('exited');
$table->morphs('destination');
$table->morphs('source');

1
database/seeders/DatabaseSeeder.php
View File

@ -14,6 +14,7 @@ public function run(): void
TeamSeeder::class,
PrivateKeySeeder::class,
ServerSeeder::class,
ServerSettingSeeder::class,
ProjectSeeder::class,
ProjectSettingSeeder::class,
EnvironmentSeeder::class,

25
database/seeders/ServerSettingSeeder.php Normal file
View File

@ -0,0 +1,25 @@
<?php
namespace Database\Seeders;
use App\Models\Server;
use App\Models\Team;
use Illuminate\Database\Seeder;
class ServerSettingSeeder extends Seeder
{
/**
* Run the database seeds.
*/
public function run(): void
{
$server_1 = Server::find(1)->load(['settings']);
$server_1->settings->is_build_server = true;
$server_1->settings->save();
$server_2 = Server::find(2)->load(['settings']);
$server_2->settings->is_build_server = true;
$server_2->settings->save();
}
}

2
docker/dev/supervisord.conf
View File

@ -34,7 +34,7 @@ autostart=true
autorestart=true
stopasgroup=true
killasgroup=true
numprocs=8
numprocs=1
redirect_stderr=true
stdout_logfile=/var/www/html/storage/logs/worker.log
stopwaitsecs=3600