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

Initial implementation of improved sever model and logic

Browse source
This commit is contained in:
Dane Everitt 2017-02-02 18:21:36 -05:00
parent fb589a7f4e
commit d4bcf0be59
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
31 changed files with 223 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ class ServerController extends BaseController
'pack'
)->first();
if ($request->input('daemon') === 'true') {
$node = Models\Node::findOrFail($server->node);
$node = Models\Node::findOrFail($server->node_id);
$client = Models\Node::guzzleRequest($node->id);
$response = $client->request('GET', '/servers', [

2
app/Http/Controllers/API/User/InfoController.php
View file

@ -37,7 +37,7 @@ class InfoController extends BaseController
'id' => $server->uuidShort,
'uuid' => $server->uuid,
'name' => $server->name,
'node' => $server->nodeName,
'node' => $server->node_idName,
'ip' => [
'set' => $server->ip,
'alias' => $server->ip_alias,

6
app/Http/Controllers/API/User/ServerController.php
View file

@ -35,7 +35,7 @@ class ServerController extends BaseController
public function info(Request $request, $uuid)
{
$server = Models\Server::getByUUID($uuid);
$node = Models\Node::findOrFail($server->node);
$node = Models\Node::findOrFail($server->node_id);
$client = Models\Node::guzzleRequest($node->id);
try {
@ -61,7 +61,7 @@ class ServerController extends BaseController
$allocations = Models\Allocation::select('id', 'ip', 'port', 'ip_alias as alias')->where('assigned_to', $server->id)->get();
foreach ($allocations as &$allocation) {
$allocation->default = ($allocation->id === $server->allocation);
$allocation->default = ($allocation->id === $server->allocation_id);
unset($allocation->id);
}
@ -92,7 +92,7 @@ class ServerController extends BaseController
public function power(Request $request, $uuid)
{
$server = Models\Server::getByUUID($uuid);
$client = Models\Node::guzzleRequest($server->node);
$client = Models\Node::guzzleRequest($server->node_id);
Auth::user()->can('power-' . $request->input('action'), $server);