Cache resource lookup results for 20 seconds for each server

This commit is contained in:
Dane Everitt 2021-03-21 12:29:18 -07:00
parent c7375f09d3
commit 9b46d59045
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 19 additions and 5 deletions

View file

@ -2,7 +2,9 @@
namespace Pterodactyl\Http\Controllers\Api\Client\Servers; namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
use Carbon\Carbon;
use Pterodactyl\Models\Server; use Pterodactyl\Models\Server;
use Illuminate\Cache\Repository;
use Pterodactyl\Transformers\Api\Client\StatsTransformer; use Pterodactyl\Transformers\Api\Client\StatsTransformer;
use Pterodactyl\Repositories\Wings\DaemonServerRepository; use Pterodactyl\Repositories\Wings\DaemonServerRepository;
use Pterodactyl\Http\Controllers\Api\Client\ClientApiController; use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
@ -13,26 +15,38 @@ class ResourceUtilizationController extends ClientApiController
/** /**
* @var \Pterodactyl\Repositories\Wings\DaemonServerRepository * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
*/ */
private $repository; private DaemonServerRepository $repository;
/**
* @var \Illuminate\Cache\Repository
*/
private Repository $cache;
/** /**
* ResourceUtilizationController constructor. * ResourceUtilizationController constructor.
*/ */
public function __construct(DaemonServerRepository $repository) public function __construct(Repository $cache, DaemonServerRepository $repository)
{ {
parent::__construct(); parent::__construct();
$this->cache = $cache;
$this->repository = $repository; $this->repository = $repository;
} }
/** /**
* Return the current resource utilization for a server. * Return the current resource utilization for a server. This value is cached for up to
* 20 seconds at a time to ensure that repeated requests to this endpoint do not cause
* a flood of unnecessary API calls.
* *
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/ */
public function __invoke(GetServerRequest $request, Server $server): array public function __invoke(GetServerRequest $request, Server $server): array
{ {
$stats = $this->repository->setServer($server)->getDetails(); $stats = $this->cache
->tags(['resources'])
->remember($server->uuid, Carbon::now()->addSeconds(20), function () use ($server) {
return $this->repository->setServer($server)->getDetails();
});
return $this->fractal->item($stats) return $this->fractal->item($stats)
->transformWith($this->getTransformer(StatsTransformer::class)) ->transformWith($this->getTransformer(StatsTransformer::class))

View file

@ -59,7 +59,7 @@ export default ({ server, className }: { server: Server; className?: string }) =
getStats().then(() => { getStats().then(() => {
// @ts-ignore // @ts-ignore
interval.current = setInterval(() => getStats(), 20000); interval.current = setInterval(() => getStats(), 30000);
}); });
return () => { return () => {