Merge branch 'next' into feat/disable-default-redirect

app/Livewire/Server/Advanced.php

@@ -43,7 +43,7 @@ class Advanced extends Component
             $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
             $this->parameters = get_route_parameters();
             $this->syncData();
-        } catch (\Throwable $e) {
+        } catch (\Throwable) {
             return redirect()->route('server.show');
         }
     }

app/Livewire/Server/Charts.php

@@ -49,7 +49,6 @@ class Charts extends Component
             $this->dispatch("refreshChartData-{$this->chartId}-memory", [
                 'seriesData' => $memoryMetrics,
             ]);
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Form.php

@@ -86,7 +86,6 @@ class Form extends Component
         $this->server = $server;
         $this->timezones = collect(timezone_identifiers_list())->sort()->values()->toArray();
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
-
     }
 
     public function checkSyncStatus()
@@ -169,7 +168,6 @@ class Form extends Component
     public function instantSave()
     {
         try {
-
             $this->validate();
             refresh_server_connection($this->server->privateKey);
             $this->validateServer(false);

app/Livewire/Server/LogDrains.php

@@ -51,7 +51,6 @@ class LogDrains extends Component
 
     public function syncData(bool $toModel = false)
     {
-
         if ($toModel) {
             $this->validate();
             $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
@@ -78,7 +77,6 @@ class LogDrains extends Component
             $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
             $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
         }
-
     }
 
     public function instantSave()

app/Livewire/Server/Proxy.php

@@ -113,7 +113,6 @@ class Proxy extends Component
             } else {
                 $this->dispatch('traefikDashboardAvailable', false);
             }
-
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Proxy/Deploy.php

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