Merge pull request #1343 from coollabsio/next

v4.0.0-beta.96

app/Console/Kernel.php

@@ -19,13 +19,9 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (isDev()) {
-            // $schedule->job(new ContainerStatusJob(Server::find(0)))->everyTenMinutes()->onOneServer();
-            // $schedule->command('horizon:snapshot')->everyMinute();
+            $schedule->command('horizon:snapshot')->everyMinute();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
-            // $schedule->job(new CheckResaleLicenseJob)->hourly();
-            // $schedule->job(new DockerCleanupJob)->everyOddHour();
-            // $this->instance_auto_update($schedule);
-            // $this->check_scheduled_backups($schedule);
+            $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);
             $this->cleanup_servers($schedule);
             $this->check_scheduled_backups($schedule);
@@ -69,7 +65,6 @@ class Kernel extends ConsoleKernel
     }
     private function check_scheduled_backups($schedule)
     {
-        ray('check_scheduled_backups');
         $scheduled_backups = ScheduledDatabaseBackup::all();
         if ($scheduled_backups->isEmpty()) {
             ray('no scheduled backups');

app/Http/Livewire/Project/Application/General.php

@@ -119,6 +119,7 @@ class General extends Component
     public function instantSave()
     {
         // @TODO: find another way - if possible
+        $force_https = $this->application->settings->is_force_https_enabled;
         $this->application->settings->is_static = $this->is_static;
         if ($this->is_static) {
             $this->application->ports_exposes = 80;
@@ -137,6 +138,9 @@ class General extends Component
         $this->emit('success', 'Application settings updated!');
         $this->checkLabelUpdates();
         $this->isConfigurationChanged = $this->application->isConfigurationChanged();
+        if ($force_https !== $this->is_force_https_enabled) {
+            $this->resetDefaultLabels(false);
+        }
     }
 
     public function getWildcardDomain()

app/Jobs/ApplicationDeploymentJob.php

@@ -75,6 +75,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private string $serverUserHomeDir = '/root';
     private string $dockerConfigFileExists = 'NOK';
 
+    private int $customPort = 22;
+
     public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
@@ -167,6 +169,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         // Get user home directory
         $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
         $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server);
+
+        // Check custom port
+        preg_match('/(?<=:)\d+(?=\/)/', $this->application->git_repository, $matches);
+        if (count($matches) === 1) {
+            $this->customPort = $matches[0];
+            $gitHost = str($this->application->git_repository)->before(':');
+            $gitRepo = str($this->application->git_repository)->after('/');
+            $this->application->git_repository = "$gitHost:$gitRepo";
+        }
         try {
             if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -549,13 +560,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             }
         }
         if ($this->application->deploymentType() === 'deploy_key') {
-            $port = 22;
-            preg_match('/(?<=:)\d+(?=\/)/', $this->application->git_repository, $matches);
-            if (count($matches) === 1) {
-                $port = $matches[0];
-            }
             $private_key = base64_encode($this->application->private_key->private_key);
-            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -p $port -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_repository} {$this->basedir}";
+            $git_clone_command = "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" {$git_clone_command} {$this->application->git_repository} {$this->basedir}";
             $git_clone_command = $this->set_git_import_settings($git_clone_command);
             $commands = collect([
                 executeInDocker($this->deployment_uuid, "mkdir -p /root/.ssh"),

app/Jobs/ContainerStatusJob.php

@@ -12,7 +12,6 @@ use App\Notifications\Server\Revived;
 use App\Notifications\Server\Unreachable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
@@ -25,30 +24,23 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $tries = 1;
-    public $timeout = 120;
-
-    public function middleware(): array
-    {
-        return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->server->uuid;
-    }
-
     public function __construct(public Server $server)
     {
-        if (isDev()) {
-            $this->handle();
-        }
+    }
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping($this->server->id))->dontRelease()];
     }
 
-    public function handle()
+    public function uniqueId(): int
     {
+        return $this->server->id;
+    }
+
+    public function handle(): void
+    {
+        ray("checking server status for {$this->server->id}");
         try {
-            // ray("checking server status for {$this->server->id}");
             // ray()->clearAll();
             $serverUptimeCheckNumber = $this->server->unreachable_count;
             $serverUptimeCheckNumberMax = 3;
@@ -129,7 +121,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 } catch (\Throwable $e) {
                     ray($e);
                 }
-
             } else {
                 $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
                 $this->server->save();
@@ -308,7 +299,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
         } catch (\Throwable $e) {
             send_internal_notification('ContainerStatusJob failed with: ' . $e->getMessage());
             ray($e->getMessage());
-            return handleError($e);
+            handleError($e);
         }
     }
 }

app/Models/Service.php

@@ -538,7 +538,7 @@ class Service extends BaseModel
                 $serviceLabels = $serviceLabels->merge($defaultLabels);
                 if (!$isDatabase && $fqdns->count() > 0) {
                     if ($fqdns) {
-                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($fqdns, true));
+                        $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true));
                     }
                 }
                 data_set($service, 'labels', $serviceLabels->toArray());

app/Notifications/Channels/EmailChannel.php

@@ -30,7 +30,12 @@ class EmailChannel
             );
         } catch (Exception $e) {
             ray($e->getMessage());
-            send_internal_notification("EmailChannel error: {$e->getMessage()}. Failed to send email to: " . implode(', ', $recepients) . " with subject: {$mailMessage->subject}");
+            $message = "EmailChannel error: {$e->getMessage()}. Failed to send email to:";
+            if (isset($recepients)) {
+                $message .= implode(', ', $recepients);
+            }
+            $message .= " with subject: {$mailMessage->subject}";
+            send_internal_notification($message);
             throw $e;
         }
     }

bootstrap/helpers/docker.php

@@ -147,12 +147,11 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
     }
     return $labels;
 }
-function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled, $onlyPort = null)
+function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_https_enabled, $onlyPort = null)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
-    foreach ($domains as $domain) {
-        $uuid = (string)new Cuid2(7);
+    foreach ($domains as $loop => $domain) {
         $url = Url::fromString($domain);
         $host = $url->getHost();
         $path = $url->getPath();
@@ -161,8 +160,8 @@ function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled,
         if (is_null($port) && !is_null($onlyPort)) {
             $port = $onlyPort;
         }
-        $http_label = "{$uuid}-http";
-        $https_label = "{$uuid}-https";
+        $http_label = "{$uuid}-{$loop}-http";
+        $https_label = "{$uuid}-{$loop}-https";
 
         if ($schema === 'https') {
             // Set labels for https
@@ -213,13 +212,13 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
         $onlyPort = $ports[0];
     }
     $pull_request_id = data_get($preview, 'pull_request_id', 0);
-    $container_name = generateApplicationContainerName($application, $pull_request_id);
+    // $container_name = generateApplicationContainerName($application, $pull_request_id);
     $appId = $application->id;
     if ($pull_request_id !== 0 && $pull_request_id !== null) {
         $appId = $appId . '-pr-' . $pull_request_id;
     }
     $labels = collect([]);
-    $labels = $labels->merge(defaultLabels($appId, $container_name, $pull_request_id));
+    $labels = $labels->merge(defaultLabels($appId, $application->uuid, $pull_request_id));
     if ($application->fqdn) {
         if ($pull_request_id !== 0) {
             $domains = Str::of(data_get($preview, 'fqdn'))->explode(',');
@@ -227,8 +226,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
             $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
         }
         // Add Traefik labels no matter which proxy is selected
-        $labels = $labels->merge(fqdnLabelsForTraefik($domains, $application->settings->is_force_https_enabled, $onlyPort));
+        $labels = $labels->merge(fqdnLabelsForTraefik($application->uuid, $domains, $application->settings->is_force_https_enabled, $onlyPort));
     }
-    ray($labels);
     return $labels->all();
 }

config/horizon.php

@@ -210,13 +210,13 @@ return [
         'production' => [
             's6' => [
                 'autoScalingStrategy' => 'size',
-                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 10),
+                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2),
                 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1),
                 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1),
             ],
             'long-running' => [
                 'autoScalingStrategy' => 'size',
-                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 10),
+                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2),
                 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1),
                 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1),
             ],
@@ -225,13 +225,13 @@ return [
         'local' => [
             's6' => [
                 'autoScalingStrategy' => 'size',
-                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 10),
+                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2),
                 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1),
                 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1),
             ],
             'long-running' => [
                 'autoScalingStrategy' => 'size',
-                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 10),
+                'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2),
                 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1),
                 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1),
             ],

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // 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.94',
+    'release' => '4.0.0-beta.96',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.94';
+return '4.0.0-beta.96';

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.94"
+            "version": "4.0.0-beta.96"
         }
     }
 }