Skip to content

Commit

Permalink
Update versions and add server readiness check
Browse files Browse the repository at this point in the history
  • Loading branch information
andrasbacsai committed Nov 17, 2023
1 parent 8c73068 commit d430813
Show file tree
Hide file tree
Showing 8 changed files with 148 additions and 140 deletions.
3 changes: 2 additions & 1 deletion app/Console/Commands/Init.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,16 @@ private function cleanup_stucked_helper_containers() {
private function alive()
{
$id = config('app.id');
$version = config('app.version');
$settings = InstanceSettings::get();
$do_not_track = data_get($settings, 'do_not_track');
if ($do_not_track == true) {
echo "Skipping alive as do_not_track is enabled\n";
return;
}
try {
Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id&version=$version");
echo "I am alive!\n";
Http::get("https://get.coollabs.io/coolify/v4/alive?appId=$id");
} catch (\Throwable $e) {
echo "Error in alive: {$e->getMessage()}\n";
}
Expand Down
1 change: 1 addition & 0 deletions app/Jobs/ServerStatusJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public function handle(): void
ray("checking server status for {$this->server->id}");
try {
if (!$this->server->checkServerRediness()) {
ray('server not ready');
return;
}
$this->cleanup(notify: false);
Expand Down
1 change: 1 addition & 0 deletions app/Models/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public function checkServerRediness()
}
break;
}
return true;
}
public function getDiskUsage()
{
Expand Down
2 changes: 1 addition & 1 deletion config/sentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.140',
'release' => '4.0.0-beta.141',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

Expand Down
2 changes: 1 addition & 1 deletion config/version.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?php

return '4.0.0-beta.140';
return '4.0.0-beta.141';
265 changes: 135 additions & 130 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"build": "vite build"
},
"devDependencies": {
"@vitejs/plugin-vue": "4.4.0",
"@vitejs/plugin-vue": "4.5.0",
"autoprefixer": "10.4.16",
"axios": "1.5.1",
"axios": "1.6.2",
"laravel-vite-plugin": "0.8.1",
"postcss": "8.4.31",
"tailwindcss": "3.3.5",
"vite": "4.4.11",
"vue": "3.3.4"
"vite": "4.5.0",
"vue": "3.3.8"
},
"dependencies": {
"@tailwindcss/typography": "0.5.10",
"alpinejs": "3.13.1",
"daisyui": "4.0.3",
"alpinejs": "3.13.2",
"daisyui": "4.3.1",
"tailwindcss-scrollbar": "0.1.0"
}
}
2 changes: 1 addition & 1 deletion versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.140"
"version": "4.0.0-beta.141"
}
}
}
Expand Down

0 comments on commit d430813

Please sign in to comment.