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

Merge pull request #2220 from coollabsio/next

Browse Source 
v4.0.0-beta.279
This commit is contained in:
Andras Bacsai 2024-05-16 13:34:33 +02:00 committed by GitHub
commit e6d1233bfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Console/Kernel.php
View File

@ -18,7 +18,6 @@ use App\Models\Server;
use App\Models\Team; use App\Models\Team;
use Illuminate\Console\Scheduling\Schedule; use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel; use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
use Illuminate\Support\Sleep;
class Kernel extends ConsoleKernel class Kernel extends ConsoleKernel
{ {
@ -77,28 +76,13 @@ class Kernel extends ConsoleKernel
$containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false); $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
} }
foreach ($containerServers as $server) { foreach ($containerServers as $server) {
$schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer()->before(function () { $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
if (isCloud()) {
$wait = rand(5, 20);
Sleep::for($wait)->seconds();
}
});
if ($server->isLogDrainEnabled()) { if ($server->isLogDrainEnabled()) {
$schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer()->before(function () { $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
if (isCloud()) {
$wait = rand(5, 20);
Sleep::for($wait)->seconds();
}
});
} }
} }
foreach ($servers as $server) { foreach ($servers as $server) {
$schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer()->before(function () { $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
if (isCloud()) {
$wait = rand(5, 20);
Sleep::for($wait)->seconds();
}
});
} }
} }
private function instance_auto_update($schedule) private function instance_auto_update($schedule)

12
app/Jobs/ApplicationDeploymentJob.php
View File

@ -1179,8 +1179,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
] ]
); );
if ($this->saved_outputs->get('commit_message')) { if ($this->saved_outputs->get('commit_message')) {
$this->application_deployment_queue->commit_message = $this->saved_outputs->get('commit_message'); $commit_message = str($this->saved_outputs->get('commit_message'))->limit(50);
ApplicationDeploymentQueue::whereCommit($this->commit)->whereApplicationId($this->application->id)->update(['commit_message' => $this->saved_outputs->get('commit_message')]); $this->application_deployment_queue->commit_message = $commit_message->value();
ApplicationDeploymentQueue::whereCommit($this->commit)->whereApplicationId($this->application->id)->update(
['commit_message' => $commit_message->value()]
);
$this->application_deployment_queue->save(); $this->application_deployment_queue->save();
} }
} }
@ -1965,7 +1968,10 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
if (!$this->only_this_server) { if (!$this->only_this_server) {
$this->deploy_to_additional_destinations(); $this->deploy_to_additional_destinations();
} }
$this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview)); if (!isCloud()) {
// TODO: turn off until we have a better solution
$this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
}
} }
} }

2
config/sentry.php
View File

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

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.278'; return '4.0.0-beta.279';

2
versions.json
View File

@ -1,7 +1,7 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.278" "version": "4.0.0-beta.279"
}, },
"sentinel": { "sentinel": {
"version": "0.0.4" "version": "0.0.4"