1day2die il y a 2 ans
Parent
commit
5dff5e56fd
2 fichiers modifiés avec 4 ajouts et 1 suppressions
  1. 3 0
      app/Classes/Pterodactyl.php
  2. 1 1
      app/Http/Controllers/ServerController.php

+ 3 - 0
app/Classes/Pterodactyl.php

@@ -11,6 +11,7 @@ use Exception;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Response;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 
 class Pterodactyl
 class Pterodactyl
 {
 {
@@ -369,7 +370,9 @@ class Pterodactyl
         }
         }
         $node = $response['attributes'];
         $node = $response['attributes'];
         $freeMemory = $node['memory'] - $node['allocated_resources']['memory'];
         $freeMemory = $node['memory'] - $node['allocated_resources']['memory'];
+        Log::debug("Free Memory:".$freeMemory);
         $freeDisk = $node['disk'] - $node['allocated_resources']['disk'];
         $freeDisk = $node['disk'] - $node['allocated_resources']['disk'];
+        Log::debug("Free Memory:".$freeDisk);
         if ($freeMemory < $requireMemory) {
         if ($freeMemory < $requireMemory) {
             return false;
             return false;
           }
           }

+ 1 - 1
app/Http/Controllers/ServerController.php

@@ -277,7 +277,7 @@ class ServerController extends Controller
         $requireMemory = $newProduct->memory - $oldProduct->memory;
         $requireMemory = $newProduct->memory - $oldProduct->memory;
         $requiredisk   = $newProduct->disk - $oldProduct->disk;
         $requiredisk   = $newProduct->disk - $oldProduct->disk;
         $checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
         $checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
-        if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server.". $requiredisk. "disk, ".$requireMemory));
+        if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
 
 
         $priceupgrade = $newProduct->getHourlyPrice();
         $priceupgrade = $newProduct->getHourlyPrice();