Skip to content

Commit 095d85b

Browse files
committed
Added the server as argument, and improved the bug fix
1 parent 06a67bb commit 095d85b

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

app/Http/Controllers/Admin/StatisticsController.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
namespace Pterodactyl\Http\Controllers\Admin;
44

55
use Illuminate\Http\Request;
6+
use Illuminate\Support\Facades\DB;
7+
use JavaScript;
68
use Pterodactyl\Http\Controllers\Controller;
79
use Pterodactyl\Models\Allocation;
810
use Pterodactyl\Models\Database;
911
use Pterodactyl\Models\Egg;
1012
use Pterodactyl\Models\Node;
1113
use Pterodactyl\Models\Server;
1214
use Pterodactyl\Models\User;
13-
use JavaScript;
14-
use Illuminate\Support\Facades\DB;
1515
use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
1616

1717
class StatisticsController extends Controller
@@ -29,7 +29,7 @@ public function index(Request $request)
2929
$servers = Server::all();
3030
$nodes = Node::all();
3131
$serversCount = count($servers);
32-
$nodesCount = Node::count();
32+
$nodesCount = count($nodes);
3333
$usersCount = User::count();
3434
$eggsCount = Egg::count();
3535
$databasesCount = Database::count();
@@ -43,7 +43,11 @@ public function index(Request $request)
4343

4444
$tokens = [];
4545
foreach ($nodes as $node) {
46-
$tokens[$node->id] = $this->keyProviderService->handle($node->servers->get(0), $request->user());
46+
$server = Server::where('node_id', $node->id)->first();
47+
if ($server == null)
48+
continue;
49+
50+
$tokens[$node->id] = $this->keyProviderService->handle($server, $request->user());
4751
}
4852

4953
Javascript::put([

public/themes/pterodactyl/js/admin/statistics.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,10 @@ var servers = Pterodactyl.servers;
6161
var nodes = Pterodactyl.nodes;
6262

6363
for (let i = 0; i < servers.length; i++) {
64-
setTimeout(getStatus, 200 * i);
64+
setTimeout(getStatus, 200 * i, servers[i]);
6565
}
6666

67-
var index = 0;
68-
function getStatus() {
69-
var server = servers[index];
67+
function getStatus(server) {
7068
var uuid = server.uuid;
7169
var node = getNodeByID(server.node_id);
7270

@@ -109,13 +107,12 @@ function getStatus() {
109107
statusChart.data.datasets[0].data[3]++;
110108
statusChart.update();
111109
});
112-
113-
index++;
114110
}
115111

116112
function getNodeByID(id) {
117113
for (var i = 0; i < nodes.length; i++) {
118-
if (nodes[i].id === id)
114+
if (nodes[i].id === id) {
119115
return nodes[i];
116+
}
120117
}
121118
}

0 commit comments

Comments
 (0)