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

Merge branch 'develop' into v2

Browse source
This commit is contained in:
Matthew Penner 2021-09-15 10:30:40 -06:00
commit 23a160b9e1
No known key found for this signature in database
GPG key ID: 030E4AB751DC756F
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -3,6 +3,11 @@ This file is a running track of new features and fixes to each version of the pa
This project follows [Semantic Versioning](http://semver.org) guidelines. This project follows [Semantic Versioning](http://semver.org) guidelines.
## v1.6.1
### Fixed
* Fixes server build modifications not being properly persisted to the database when edited.
* Correctly exposes the `oom_disabled` field in the `build` limits block for a server build so that Wings can pick it up.
*
## v1.6.0 ## v1.6.0
### Fixed ### Fixed
* Fixes array merging logic for server transfers that would cause a 500 error to occur in some scenarios. * Fixes array merging logic for server transfers that would cause a 500 error to occur in some scenarios.

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

@ -58,9 +58,13 @@ class ServerConfigurationStructureService
'cpu_limit' => $server->cpu, 'cpu_limit' => $server->cpu,
'threads' => $server->threads, 'threads' => $server->threads,
'disk_space' => $server->disk, 'disk_space' => $server->disk,
'oom_disabled' => $server->oom_disabled,
], ],
'container' => [ 'container' => [
'image' => $server->image, 'image' => $server->image,
// This field is deprecated — use the value in the "build" block.
//
// TODO: remove this key in V2.
'oom_disabled' => $server->oom_disabled, 'oom_disabled' => $server->oom_disabled,
'requires_rebuild' => false, 'requires_rebuild' => false,
], ],

2
app/Transformers/Api/Application/ServerTransformer.php
View file

@ -56,6 +56,7 @@ class ServerTransformer extends Transformer
'io' => $model->io, 'io' => $model->io,
'cpu' => $model->cpu, 'cpu' => $model->cpu,
'threads' => $model->threads, 'threads' => $model->threads,
'oom_disabled' => $model->oom_disabled,
], ],
'feature_limits' => [ 'feature_limits' => [
'databases' => $model->database_limit, 'databases' => $model->database_limit,
@ -72,7 +73,6 @@ class ServerTransformer extends Transformer
'image' => $model->image, 'image' => $model->image,
'environment' => $this->environmentService->handle($model), 'environment' => $this->environmentService->handle($model),
], ],
'oom_killer' => !$model->oom_disabled,
'updated_at' => self::formatTimestamp($model->updated_at), 'updated_at' => self::formatTimestamp($model->updated_at),
'created_at' => self::formatTimestamp($model->created_at), 'created_at' => self::formatTimestamp($model->created_at),
]; ];

2
app/Transformers/Api/Client/ServerTransformer.php
View file

@ -51,6 +51,8 @@ class ServerTransformer extends Transformer
'disk' => $server->disk, 'disk' => $server->disk,
'io' => $server->io, 'io' => $server->io,
'cpu' => $server->cpu, 'cpu' => $server->cpu,
'threads' => $server->threads,
'oom_disabled' => $server->oom_disabled,
], ],
'invocation' => $this->service->handle($server, $this->user()->cannot(Permission::ACTION_STARTUP_READ, $server)), 'invocation' => $this->service->handle($server, $this->user()->cannot(Permission::ACTION_STARTUP_READ, $server)),
'docker_image' => $server->image, 'docker_image' => $server->image,