Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix connection issues when changing node FQDN; closes #1931

Browse source
This commit is contained in:
Dane Everitt 2020-05-09 16:25:22 -07:00
parent 86dbb141f4
commit 33a7762152
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Services/Nodes/NodeUpdateService.php
View file

@ -77,6 +77,19 @@ class NodeUpdateService
$updated = $this->repository->withFreshModel()->update($node->id, $data, true, true); $updated = $this->repository->withFreshModel()->update($node->id, $data, true, true);
try { try {
// If we're changing the FQDN for the node, use the newly provided FQDN for the connection
// address. This should alleviate issues where the node gets pointed to a "valid" FQDN that
// isn't actually running the daemon software, and therefore you can't actually change it
// back.
//
// This makes more sense anyways, because only the Panel uses the FQDN for connecting, the
// node doesn't actually care about this.
//
// @see https://github.com/pterodactyl/panel/issues/1931
if (! empty($data['fqdn'])) {
$node->fqdn = $data['fqdn'];
}
$this->configurationRepository->setNode($node)->update($updated); $this->configurationRepository->setNode($node)->update($updated);
} catch (DaemonConnectionException $exception) { } catch (DaemonConnectionException $exception) {
if (! is_null($exception->getPrevious()) && $exception->getPrevious() instanceof ConnectException) { if (! is_null($exception->getPrevious()) && $exception->getPrevious() instanceof ConnectException) {