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

Merge branch 'matthewpi/fix-server-build-modification' into v2

Browse source
This commit is contained in:
Matthew Penner 2021-09-12 16:31:42 -06:00
commit c716be263b
No known key found for this signature in database
GPG key ID: 030E4AB751DC756F
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,8 +56,6 @@ class BuildModificationService
*/ */
public function handle(Server $server, array $data) public function handle(Server $server, array $data)
{ {
$this->connection->beginTransaction();
/** @var \Pterodactyl\Models\Server $server */ /** @var \Pterodactyl\Models\Server $server */
$server = $this->connection->transaction(function() use ($server, $data) { $server = $this->connection->transaction(function() use ($server, $data) {
$this->processAllocations($server, $data); $this->processAllocations($server, $data);
@ -87,7 +85,7 @@ class BuildModificationService
// Because Wings always fetches an updated configuration from the Panel when booting // 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. // 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 // Ideally this request succeeds, so we can apply resource modifications on the fly, but
// 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 {