StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add in query caching on server view

Browse source
This commit is contained in:
Dane Everitt 2017-02-17 18:19:53 -05:00
parent ff9904227b
commit 9af06b4b59
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
14 changed files with 263 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Models/Server.php
View file

@ -25,6 +25,7 @@
namespace Pterodactyl\Models;
use Auth;
use Cache;
use Javascript;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Notifications\Notifiable;
@ -113,16 +114,19 @@ class Server extends Model
*/
public static function byUuid($uuid)
{
$query = self::with('service', 'node')->where(function ($q) use ($uuid) {
$q->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
// Results are cached because we call this functions a few times on page load.
$result = Cache::remember('Server.byUuid.' . $uuid, 60, function () use ($uuid) {
$query = self::with('service', 'node')->where(function ($q) use ($uuid) {
$q->where('uuidShort', $uuid)->orWhere('uuid', $uuid);
});
if (! Auth::user()->isRootAdmin()) {
$query->whereIn('id', Auth::user()->serverAccessArray());
}
return $query->first();
});
if (! Auth::user()->isRootAdmin()) {
$query->whereIn('id', Auth::user()->serverAccessArray());
}
$result = $query->first();
if (! is_null($result)) {
$result->daemonSecret = Auth::user()->daemonToken($result);
}

4
app/Models/User.php
View file

@ -186,9 +186,9 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
*
* @return Collection
*/
public function serverAccessCollection($paginate = null)
public function serverAccessCollection($paginate = null, $load = ['service', 'node', 'allocation'])
{
$query = Server::with('service', 'node');
$query = Server::with($load);
if (! $this->isRootAdmin()) {
$query->whereIn('id', $this->serverAccessArray());
}