server: track reinstall failures differently from initial install fai…

…lures (pterodactyl#4531)
Nookure · Nov 21, 2022 · a4f6870 · a4f6870
1 parent 039ad4a
commit a4f6870
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php b/app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php
@@ -48,8 +48,18 @@ public function index(Request $request, string $uuid): JsonResponse
     public function store(InstallationDataRequest $request, string $uuid): JsonResponse
     {
         $server = $this->repository->getByUuid($uuid);
+        $status = null;
 
-        $status = $request->boolean('successful') ? null : Server::STATUS_INSTALL_FAILED;
+        // Make sure the type of failure is accurate
+        if (!$request->boolean('successful')) {
+            $status = Server::STATUS_INSTALL_FAILED;
+
+            if ($request->boolean('reinstall')) {
+                $status = Server::STATUS_REINSTALL_FAILED;
+            }
+        }
+
+        // Keep the server suspended if it's already suspended
         if ($server->status === Server::STATUS_SUSPENDED) {
             $status = Server::STATUS_SUSPENDED;
         }

diff --git a/app/Http/Requests/Api/Remote/InstallationDataRequest.php b/app/Http/Requests/Api/Remote/InstallationDataRequest.php
@@ -15,6 +15,7 @@ public function rules(): array
     {
         return [
             'successful' => 'present|boolean',
+            'reinstall' => 'sometimes|boolean',
         ];
     }
 }
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -115,6 +115,7 @@ class Server extends Model
 
     public const STATUS_INSTALLING = 'installing';
     public const STATUS_INSTALL_FAILED = 'install_failed';
+    public const STATUS_REINSTALL_FAILED = 'reinstall_failed';
     public const STATUS_SUSPENDED = 'suspended';
     public const STATUS_RESTORING_BACKUP = 'restoring_backup';