Add back support for reinstalling a server

This commit is contained in:
Dane Everitt 2020-04-03 13:46:45 -07:00
parent dfefd8845b
commit 7d45379f31
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 28 additions and 23 deletions

View file

@ -61,6 +61,10 @@ class Server extends Validable
*/
const RESOURCE_NAME = 'server';
const STATUS_INSTALLING = 0;
const STATUS_INSTALLED = 1;
const STATUS_INSTALL_FAILED = 2;
/**
* The table associated with the model.
*

View file

@ -2,7 +2,6 @@
namespace Pterodactyl\Repositories\Wings;
use BadMethodCallException;
use Webmozart\Assert\Assert;
use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\TransferException;
@ -13,7 +12,6 @@ class DaemonServerRepository extends DaemonRepository
/**
* Returns details about a server from the Daemon instance.
*
* @return array
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/
public function getDetails(): array
@ -89,10 +87,20 @@ class DaemonServerRepository extends DaemonRepository
/**
* Reinstall a server on the daemon.
*
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/
public function reinstall(): void
{
throw new BadMethodCallException('Method is not implemented.');
Assert::isInstanceOf($this->server, Server::class);
try {
$this->getHttpClient()->post(sprintf(
'/api/servers/%s/reinstall', $this->server->uuid
));
} catch (TransferException $exception) {
throw new DaemonConnectionException($exception);
}
}
/**

View file

@ -3,11 +3,9 @@
namespace Pterodactyl\Services\Servers;
use Pterodactyl\Models\Server;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Repositories\Wings\DaemonServerRepository;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class ReinstallServerService
{
@ -44,28 +42,23 @@ class ReinstallServerService
}
/**
* @param int|\Pterodactyl\Models\Server $server
* Reinstall a server on the remote daemon.
*
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @param \Pterodactyl\Models\Server $server
* @return \Pterodactyl\Models\Server
*
* @throws \Throwable
*/
public function reinstall($server)
public function reinstall(Server $server)
{
if (! $server instanceof Server) {
$server = $this->repository->find($server);
}
$this->database->transaction(function () use ($server) {
$this->repository->withoutFreshModel()->update($server->id, [
'installed' => Server::STATUS_INSTALLING,
]);
$this->database->beginTransaction();
$this->repository->withoutFreshModel()->update($server->id, [
'installed' => 0,
], true, true);
try {
$this->daemonServerRepository->setServer($server)->reinstall();
$this->database->commit();
} catch (RequestException $exception) {
throw new DaemonConnectionException($exception);
}
});
return $server->refresh();
}
}