dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

Allow modification of server build settings even when node is offline

Browse Source
This commit is contained in:
Dane Everitt 2021-03-21 11:49:42 -07:00
parent 28148f4845
commit 7676f7dd66
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/Servers/BuildModificationService.php
View File

@ -5,10 +5,12 @@ namespace Pterodactyl\Services\Servers;
use Illuminate\Support\Arr;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\Allocation;
use Illuminate\Support\Facades\Log;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Exceptions\DisplayException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Pterodactyl\Repositories\Wings\DaemonServerRepository;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class BuildModificationService
{
@ -78,10 +80,18 @@ class BuildModificationService
$updateData = $this->structureService->handle($server);
// Because Wings always fetches an updated configuration from the Panel when booting
// a server this type of exception can be safely "ignored" and just written to the logs.
// Ideally this request succeedes so we can apply resource modifications on the fly
// but if it fails it isn't the end of the world.
if (!empty($updateData['build'])) {
try {
$this->daemonServerRepository->setServer($server)->update([
'build' => $updateData['build'],
]);
} catch (DaemonConnectionException $exception) {
Log::warning($exception, ['server_id' => $server->id]);
}
}
$this->connection->commit();

33
tests/Integration/Services/Servers/BuildModificationServiceTest.php
View File

@ -3,12 +3,17 @@
namespace Pterodactyl\Tests\Integration\Services\Servers;
use Mockery;
use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response;
use Pterodactyl\Models\Server;
use Pterodactyl\Models\Allocation;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Tests\Integration\IntegrationTestCase;
use Pterodactyl\Repositories\Wings\DaemonServerRepository;
use Pterodactyl\Services\Servers\BuildModificationService;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class BuildModificationServiceTest extends IntegrationTestCase
{
@ -149,6 +154,30 @@ class BuildModificationServiceTest extends IntegrationTestCase
$this->assertSame(20, $response->allocation_limit);
}
/**
* Test that an exception when connecting to the Wings instance is properly ignored
* when making updates. This allows for a server to be modified even when the Wings
* node is offline.
*/
public function testConnectionExceptionIsIgnoredWhenUpdatingServerSettings()
{
$server = $this->createServerModel();
$this->daemonServerRepository->expects('setServer->update')->andThrows(
new DaemonConnectionException(
new RequestException('Bad request', new Request('GET', '/test'), new Response())
)
);
$response = $this->getService()->handle($server, ['memory' => 256, 'disk' => 10240]);
$this->assertInstanceOf(Server::class, $response);
$this->assertSame(256, $response->memory);
$this->assertSame(10240, $response->disk);
$this->assertDatabaseHas('servers', ['id' => $response->id, 'memory' => 256, 'disk' => 10240]);
}
/**
* Test that no exception is thrown if we are only removing an allocation.
*/
@ -215,7 +244,9 @@ class BuildModificationServiceTest extends IntegrationTestCase
/**
* Test that any changes we made to the server or allocations are rolled back if there is an
* exception while performing any action.
* exception while performing any action. This is different than the connection exception
* test which should properly ignore connection issues. We want any other type of exception
* to properly be thrown back to the caller.
*/
public function testThatUpdatesAreRolledBackIfExceptionIsEncountered()
{