refactor

Author: andrasbacsai

app/Console/Commands/CleanupStuckedResources.php

@@ -2,10 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\CleanupHelperContainersJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use App\Models\ScheduledDatabaseBackup;
 use App\Models\ScheduledTask;
+use App\Models\Server;
 use App\Models\Service;
 use App\Models\ServiceApplication;
 use App\Models\ServiceDatabase;
@@ -35,6 +37,16 @@ public function handle()
     private function cleanup_stucked_resources()
     {
 
+        try {
+            $servers = Server::all()->filter(function ($server) {
+                return $server->isFunctional();
+            });
+            foreach ($servers as $server) {
+                CleanupHelperContainersJob::dispatch($server);
+            }
+        } catch (\Throwable $e) {
+            echo "Error in cleaning stucked resources: {$e->getMessage()}\n";
+        }
         try {
             $applications = Application::withTrashed()->whereNotNull('deleted_at')->get();
             foreach ($applications as $application) {

bootstrap/helpers/shared.php

@@ -1247,6 +1247,10 @@ function get_public_ips()
             }
             $settings->update(['public_ipv4' => $ipv4]);
         }
+    } catch (\Exception $e) {
+        echo "Error: {$e->getMessage()}\n";
+    }
+    try {
         $ipv6 = $second->output();
         if ($ipv6) {
             $ipv6 = trim($ipv6);

database/seeders/PopulateSshKeysDirectorySeeder.php

@@ -11,25 +11,30 @@ class PopulateSshKeysDirectorySeeder extends Seeder
 {
     public function run()
     {
-        Storage::disk('ssh-keys')->deleteDirectory('');
-        Storage::disk('ssh-keys')->makeDirectory('');
-        Storage::disk('ssh-mux')->deleteDirectory('');
-        Storage::disk('ssh-mux')->makeDirectory('');
+        try {
+            Storage::disk('ssh-keys')->deleteDirectory('');
+            Storage::disk('ssh-keys')->makeDirectory('');
+            Storage::disk('ssh-mux')->deleteDirectory('');
+            Storage::disk('ssh-mux')->makeDirectory('');
 
-        PrivateKey::chunk(100, function ($keys) {
-            foreach ($keys as $key) {
-                echo 'Storing key: '.$key->name."\n";
-                $key->storeInFileSystem();
-            }
-        });
+            PrivateKey::chunk(100, function ($keys) {
+                foreach ($keys as $key) {
+                    echo 'Storing key: '.$key->name."\n";
+                    $key->storeInFileSystem();
+                }
+            });
 
-        if (isDev()) {
-            $user = env('PUID').':'.env('PGID');
-            Process::run("chown -R $user ".storage_path('app/ssh/keys'));
-            Process::run("chown -R $user ".storage_path('app/ssh/mux'));
-        } else {
-            Process::run('chown -R 9999:9999 '.storage_path('app/ssh/keys'));
-            Process::run('chown -R 9999:9999 '.storage_path('app/ssh/mux'));
+            if (isDev()) {
+                $user = env('PUID').':'.env('PGID');
+                Process::run("chown -R $user ".storage_path('app/ssh/keys'));
+                Process::run("chown -R $user ".storage_path('app/ssh/mux'));
+            } else {
+                Process::run('chown -R 9999:9999 '.storage_path('app/ssh/keys'));
+                Process::run('chown -R 9999:9999 '.storage_path('app/ssh/mux'));
+            }
+        } catch (\Throwable $e) {
+            echo "Error: {$e->getMessage()}\n";
+            ray($e->getMessage());
         }
     }
 }

docker/prod/etc/s6-overlay/s6-rc.d/init-script/up

@@ -1,3 +1,3 @@
 #!/command/execlineb -P
 s6-setuidgid webuser
-php /var/www/html/artisan app:init --full-cleanup
+php /var/www/html/artisan app:init