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

fix

Browse Source
This commit is contained in:
Andras Bacsai 2023-05-25 22:59:33 +02:00
parent 604f6832da
commit e872dc8edb
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Livewire/ForceUpgrade.php
View File

@ -11,13 +11,8 @@ class ForceUpgrade extends Component
public function upgrade() public function upgrade()
{ {
try { try {
$server_name = 'localhost';
if (config('app.env') === 'local') {
$server_name = 'testing-local-docker-container';
}
$server = Server::where('name', $server_name)->firstOrFail();
$this->emit('updateInitiated'); $this->emit('updateInitiated');
dispatch(new InstanceAutoUpdateJob(force: true, server: $server)); dispatch(new InstanceAutoUpdateJob(force: true));
} catch (\Exception $e) { } catch (\Exception $e) {
return general_error_handler($e, $this); return general_error_handler($e, $this);
} }

32
app/Jobs/InstanceAutoUpdateJob.php
View File

@ -19,22 +19,19 @@ class InstanceAutoUpdateJob implements ShouldQueue
private string $current_version; private string $current_version;
private Server $server; private Server $server;
public function __construct(private bool $force = false, Server|null $server = null) public function __construct(private bool $force = false)
{ {
Log::info("InstanceAutoUpdateJob"); Log::info("InstanceAutoUpdateJob");
if (is_null($server)) { if (config('app.env') === 'local') {
Log::info("InstanceAutoUpdateJob: server is null"); $server_name = 'testing-local-docker-container';
if (config('app.env') === 'local') {
$server_name = 'testing-local-docker-container';
} else {
$server_name = 'localhost';
}
$this->server = Server::where('name', $server_name)->first();
Log::info("InstanceAutoUpdateJob: server is " . $this->server->name);
} else { } else {
$this->server = $server; $server_name = 'localhost';
} }
$instance_settings = InstanceSettings::get(); $server = Server::where('name', $server_name)->first();
if (is_null($server)) {
throw new \Exception("Server not found");
}
$this->server = $server;
$this->latest_version = get_latest_version_of_coolify(); $this->latest_version = get_latest_version_of_coolify();
$this->current_version = config('version'); $this->current_version = config('version');
@ -42,6 +39,8 @@ class InstanceAutoUpdateJob implements ShouldQueue
Log::info("InstanceAutoUpdateJob: current version is " . $this->current_version); Log::info("InstanceAutoUpdateJob: current version is " . $this->current_version);
if (!$this->force) { if (!$this->force) {
Log::info("InstanceAutoUpdateJob: force is false");
$instance_settings = InstanceSettings::get();
if (!$instance_settings->is_auto_update_enabled) { if (!$instance_settings->is_auto_update_enabled) {
return $this->delete(); return $this->delete();
} }
@ -70,18 +69,13 @@ class InstanceAutoUpdateJob implements ShouldQueue
Log::info('InstanceAutoUpdateJob: Starting update process'); Log::info('InstanceAutoUpdateJob: Starting update process');
if (config('app.env') === 'local') { if (config('app.env') === 'local') {
instant_remote_process([ instant_remote_process([
"sleep 2"
], $this->server);
remote_process([
"sleep 10" "sleep 10"
], $this->server); ], $this->server);
Log::info("InstanceAutoUpdateJob completed");
} else { } else {
Log::info('InstanceAutoUpdateJob: Downloading upgrade script'); Log::info('InstanceAutoUpdateJob: Running upgrade script');
instant_remote_process([ instant_remote_process([
"curl -fsSL https://coolify-cdn.b-cdn.net/files/upgrade.sh -o /data/coolify/source/upgrade.sh", "curl -fsSL https://coolify-cdn.b-cdn.net/files/upgrade.sh -o /data/coolify/source/upgrade.sh",
], $this->server);
Log::info('InstanceAutoUpdateJob: Running upgrade script');
remote_process([
"bash /data/coolify/source/upgrade.sh $this->latest_version" "bash /data/coolify/source/upgrade.sh $this->latest_version"
], $this->server); ], $this->server);
} }