sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace calls to server patch with a manual sync method

This commit is contained in:
Dane Everitt 2021-08-29 13:32:55 -07:00
parent d8d1eacb42
commit 2d47f986ee
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Repositories/Wings/DaemonServerRepository.php
View File

@ -4,6 +4,7 @@ namespace Pterodactyl\Repositories\Wings;
use Webmozart\Assert\Assert; use Webmozart\Assert\Assert;
use Pterodactyl\Models\Server; use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Exception\TransferException; use GuzzleHttp\Exception\TransferException;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException; use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@ -51,17 +52,17 @@ class DaemonServerRepository extends DaemonRepository
} }
/** /**
* Updates details about a server on the Daemon. * Triggers a server sync on Wings.
* *
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/ */
public function update(array $data): void public function sync(): void
{ {
Assert::isInstanceOf($this->server, Server::class); Assert::isInstanceOf($this->server, Server::class);
try { try {
$this->getHttpClient()->patch('/api/servers/' . $this->server->uuid, ['json' => $data]); $this->getHttpClient()->post("/api/servers/{$this->server->uuid}/sync");
} catch (TransferException $exception) { } catch (GuzzleException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception);
} }
} }
@ -101,26 +102,6 @@ class DaemonServerRepository extends DaemonRepository
} }
} }
/**
* By default this function will suspend a server instance on the daemon. However, passing
* "true" as the first argument will unsuspend the server.
*
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/
public function suspend(bool $unsuspend = false): void
{
Assert::isInstanceOf($this->server, Server::class);
try {
$this->getHttpClient()->patch(
'/api/servers/' . $this->server->uuid,
['json' => ['suspended' => !$unsuspend]]
);
} catch (TransferException $exception) {
throw new DaemonConnectionException($exception);
}
}
/** /**
* Requests the daemon to create a full archive of the server. Once the daemon is finished * Requests the daemon to create a full archive of the server. Once the daemon is finished
* they will send a POST request to "/api/remote/servers/{uuid}/archive" with a boolean. * they will send a POST request to "/api/remote/servers/{uuid}/archive" with a boolean.

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

@ -91,9 +91,7 @@ class BuildModificationService
// if it fails we can just continue on as normal. // if it fails we can just continue on as normal.
if (!empty($updateData['build'])) { if (!empty($updateData['build'])) {
try { try {
$this->daemonServerRepository->setServer($server)->update([ $this->daemonServerRepository->setServer($server)->sync();
'build' => $updateData['build'],
]);
} catch (DaemonConnectionException $exception) { } catch (DaemonConnectionException $exception) {
Log::warning($exception, ['server_id' => $server->id]); Log::warning($exception, ['server_id' => $server->id]);
} }

4
app/Services/Servers/SuspensionService.php
View File

@ -63,9 +63,9 @@ class SuspensionService
'status' => $isSuspending ? Server::STATUS_SUSPENDED : null, 'status' => $isSuspending ? Server::STATUS_SUSPENDED : null,
]); ]);
// Only send the suspension request to wings if the server is not currently being transferred. // Only trigger a Wings server sync if it is not currently being transferred.
if (is_null($server->transfer)) { if (is_null($server->transfer)) {
$this->daemonServerRepository->setServer($server)->suspend($action === self::ACTION_UNSUSPEND); $this->daemonServerRepository->setServer($server)->sync();
} }
}); });
} }