beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

g

Browse source
This commit is contained in:
1day2die 2022-08-15 16:17:44 +02:00
parent a443ae854f
commit 5dff5e56fd
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Classes/Pterodactyl.php
View file

@ -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;
} }

2
app/Http/Controllers/ServerController.php
View file

@ -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();