dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Prefer Carbon methods when possible.

Browse Source
This commit is contained in:
Lucas Michot
2024-10-31 16:47:08 +01:00
parent 231ce49817
commit 702ee5cd70
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Livewire/Project/Application/Previews.php
View File

@@ -5,6 +5,7 @@ namespace App\Livewire\Project\Application;
use App\Actions\Docker\GetContainersStatus; use App\Actions\Docker\GetContainersStatus;
use App\Models\Application; use App\Models\Application;
use App\Models\ApplicationPreview; use App\Models\ApplicationPreview;
use Carbon\Carbon;
use Illuminate\Process\InvokedProcess; use Illuminate\Process\InvokedProcess;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Process; use Illuminate\Support\Facades\Process;
@@ -239,7 +240,7 @@ class Previews extends Component
$processes[$containerName] = $this->stopContainer($containerName, $timeout); $processes[$containerName] = $this->stopContainer($containerName, $timeout);
} }
$startTime = time(); $startTime = Carbon::now()->getTimestamp();
while (count($processes) > 0) { while (count($processes) > 0) {
$finishedProcesses = array_filter($processes, function ($process) { $finishedProcesses = array_filter($processes, function ($process) {
return ! $process->running(); return ! $process->running();
@@ -249,7 +250,7 @@ class Previews extends Component
$this->removeContainer($containerName, $server); $this->removeContainer($containerName, $server);
} }
if (time() - $startTime >= $timeout) { if (Carbon::now()->getTimestamp() - $startTime >= $timeout) {
$this->forceStopRemainingContainers(array_keys($processes), $server); $this->forceStopRemainingContainers(array_keys($processes), $server);
break; break;
} }

5
app/Livewire/Server/Proxy/Deploy.php
View File

@@ -6,6 +6,7 @@ use App\Actions\Proxy\CheckProxy;
use App\Actions\Proxy\StartProxy; use App\Actions\Proxy\StartProxy;
use App\Events\ProxyStatusChanged; use App\Events\ProxyStatusChanged;
use App\Models\Server; use App\Models\Server;
use Carbon\Carbon;
use Illuminate\Process\InvokedProcess; use Illuminate\Process\InvokedProcess;
use Illuminate\Support\Facades\Process; use Illuminate\Support\Facades\Process;
use Livewire\Component; use Livewire\Component;
@@ -102,9 +103,9 @@ class Deploy extends Component
$process = $this->stopContainer($containerName, $timeout); $process = $this->stopContainer($containerName, $timeout);
$startTime = time(); $startTime = Carbon::now()->getTimestamp();
while ($process->running()) { while ($process->running()) {
if (time() - $startTime >= $timeout) { if (Carbon::now()->getTimestamp() - $startTime >= $timeout) {
$this->forceStopContainer($containerName); $this->forceStopContainer($containerName);
break; break;
} }

5
bootstrap/helpers/github.php
View File

@@ -3,6 +3,7 @@
use App\Models\GithubApp; use App\Models\GithubApp;
use App\Models\GitlabApp; use App\Models\GitlabApp;
use Carbon\Carbon; use Carbon\Carbon;
use Carbon\CarbonImmutable;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Lcobucci\JWT\Encoding\ChainedFormatter; use Lcobucci\JWT\Encoding\ChainedFormatter;
@@ -16,7 +17,7 @@ function generate_github_installation_token(GithubApp $source)
$signingKey = InMemory::plainText($source->privateKey->private_key); $signingKey = InMemory::plainText($source->privateKey->private_key);
$algorithm = new Sha256; $algorithm = new Sha256;
$tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default())); $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
$now = new DateTimeImmutable; $now = CarbonImmutable::now();
$now = $now->setTime($now->format('H'), $now->format('i')); $now = $now->setTime($now->format('H'), $now->format('i'));
$issuedToken = $tokenBuilder $issuedToken = $tokenBuilder
->issuedBy($source->app_id) ->issuedBy($source->app_id)
@@ -40,7 +41,7 @@ function generate_github_jwt_token(GithubApp $source)
$signingKey = InMemory::plainText($source->privateKey->private_key); $signingKey = InMemory::plainText($source->privateKey->private_key);
$algorithm = new Sha256; $algorithm = new Sha256;
$tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default())); $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
$now = new DateTimeImmutable; $now = CarbonImmutable::now();
$now = $now->setTime($now->format('H'), $now->format('i')); $now = $now->setTime($now->format('H'), $now->format('i'));
$issuedToken = $tokenBuilder $issuedToken = $tokenBuilder
->issuedBy($source->app_id) ->issuedBy($source->app_id)

5
bootstrap/helpers/shared.php
View File

@@ -28,6 +28,7 @@ use App\Notifications\Channels\DiscordChannel;
use App\Notifications\Channels\EmailChannel; use App\Notifications\Channels\EmailChannel;
use App\Notifications\Channels\TelegramChannel; use App\Notifications\Channels\TelegramChannel;
use App\Notifications\Internal\GeneralNotification; use App\Notifications\Internal\GeneralNotification;
use Carbon\CarbonImmutable;
use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException; use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
use Illuminate\Database\UniqueConstraintViolationException; use Illuminate\Database\UniqueConstraintViolationException;
use Illuminate\Mail\Message; use Illuminate\Mail\Message;
@@ -949,7 +950,7 @@ function generateEnvValue(string $command, Service|Application|null $service = n
$key = InMemory::plainText($signingKey); $key = InMemory::plainText($signingKey);
$algorithm = new Sha256; $algorithm = new Sha256;
$tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default())); $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
$now = new DateTimeImmutable; $now = CarbonImmutable::now();
$now = $now->setTime($now->format('H'), $now->format('i')); $now = $now->setTime($now->format('H'), $now->format('i'));
$token = $tokenBuilder $token = $tokenBuilder
->issuedBy('supabase') ->issuedBy('supabase')
@@ -969,7 +970,7 @@ function generateEnvValue(string $command, Service|Application|null $service = n
$key = InMemory::plainText($signingKey); $key = InMemory::plainText($signingKey);
$algorithm = new Sha256; $algorithm = new Sha256;
$tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default())); $tokenBuilder = (new Builder(new JoseEncoder, ChainedFormatter::default()));
$now = new DateTimeImmutable; $now = CarbonImmutable::now();
$now = $now->setTime($now->format('H'), $now->format('i')); $now = $now->setTime($now->format('H'), $now->format('i'));
$token = $tokenBuilder $token = $tokenBuilder
->issuedBy('supabase') ->issuedBy('supabase')