banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-29 13:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove shenanigans

Browse Source
This commit is contained in:
Lance Pioch 2024-06-02 21:59:12 -04:00
parent f6ef76d98e
commit 6c2d0a2d50
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Services/Nodes/NodeUpdateService.php
View File

@ -32,21 +32,10 @@ class NodeUpdateService
$data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH); $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);
} }
[$updated, $exception] = $this->connection->transaction(function () use ($data, $node) { [$node, $exception] = $this->connection->transaction(function () use ($data, $node) {
/** @var \App\Models\Node $updated */ $node->forceFill($data)->save();
$updated = $node->replicate();
$updated->forceFill($data)->save();
try { try {
// If we're changing the FQDN for the node, use the newly provided FQDN for the connection $this->configurationRepository->setNode($node)->update($node);
// 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.
$node->fqdn = $updated->fqdn;
$this->configurationRepository->setNode($node)->update($updated);
} catch (DaemonConnectionException $exception) { } catch (DaemonConnectionException $exception) {
logger()->warning($exception, ['node_id' => $node->id]); logger()->warning($exception, ['node_id' => $node->id]);
@ -56,16 +45,16 @@ class NodeUpdateService
// //
// This avoids issues with proxies such as Cloudflare which will see daemon as offline and then // This avoids issues with proxies such as Cloudflare which will see daemon as offline and then
// inject their own response pages, causing this logic to get fucked up. // inject their own response pages, causing this logic to get fucked up.
return [$updated, true]; return [$node, true];
} }
return [$updated, false]; return [$node, false];
}); });
if ($exception) { if ($exception) {
throw new ConfigurationNotPersistedException(trans('exceptions.node.daemon_off_config_updated')); throw new ConfigurationNotPersistedException(trans('exceptions.node.daemon_off_config_updated'));
} }
return $updated; return $node;
} }
} }