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

Fix server data not updating correctly on daemon

Browse source
This commit is contained in:
Dane Everitt 2019-12-21 21:01:38 -08:00
parent 3e915e526b
commit e87db889e9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 33 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/Services/Servers/BuildModificationService.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Services\Servers;
use Illuminate\Support\Arr;
use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Database\ConnectionInterface;
@ -34,16 +35,23 @@ class BuildModificationService
*/
private $repository;
/**
* @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
*/
private $structureService;
/**
* BuildModificationService constructor.
*
* @param \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface $allocationRepository
* @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $structureService
* @param \Illuminate\Database\ConnectionInterface $connection
* @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
*/
public function __construct(
AllocationRepositoryInterface $allocationRepository,
ServerConfigurationStructureService $structureService,
ConnectionInterface $connection,
DaemonServerRepository $daemonServerRepository,
ServerRepositoryInterface $repository
@ -52,6 +60,7 @@ class BuildModificationService
$this->daemonServerRepository = $daemonServerRepository;
$this->connection = $connection;
$this->repository = $repository;
$this->structureService = $structureService;
}
/**
@ -95,28 +104,12 @@ class BuildModificationService
'allocation_limit' => array_get($data, 'allocation_limit'),
]);
$updateData = [
'allocations' => [
'default' => [
'ip' => $server->allocation->ip,
'port' => $server->allocation->port,
],
'mappings' => $server->getAllocationMappings(),
],
'build' => [
'memory' => $server->memory,
'swap' => $server->swap,
'io' => $server->io,
'cpu' => $server->cpu,
'disk' => $server->disk,
],
'container' => [
'oom_disabled' => $server->oom_disabled,
],
];
$updateData = $this->structureService->handle($server);
try {
$this->daemonServerRepository->setServer($server)->update($updateData);
$this->daemonServerRepository->setServer($server)->update(
Arr::only($updateData, ['allocations', 'build', 'container'])
);
$this->connection->commit();
} catch (RequestException $exception) {
throw new DaemonConnectionException($exception);