Skip to content

Commit bd238c7

Browse files
committed
No more OOME checkboxes
1 parent 02e4c14 commit bd238c7

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
1818

1919
### Changed
2020
* Changed behavior of allocation IP Address/Ports box to automatically store the value entered if a user unfocuses the field without hitting space.
21-
* c order in which allocations are displayed to prioritize those with servers attached (in ascending IP & port order) followed by ascending IP & port order where no server is attached.
21+
* Changed order in which allocations are displayed to prioritize those with servers attached (in ascending IP & port order) followed by ascending IP & port order where no server is attached.
22+
23+
### Removed
24+
* OOM exceptions can no longer be disabled on servers due to a startling number of users that were using it to avoid allocating proper amounts of resources to servers.
2225

2326
## v0.7.0-beta.3 (Derelict Dermodactylus)
2427
### Fixed

app/Services/Servers/ServerCreationService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function create(array $data)
127127
'disk' => array_get($data, 'disk'),
128128
'io' => array_get($data, 'io'),
129129
'cpu' => array_get($data, 'cpu'),
130-
'oom_disabled' => isset($data['oom_disabled']),
130+
'oom_disabled' => false,
131131
'allocation_id' => array_get($data, 'allocation_id'),
132132
'nest_id' => array_get($data, 'nest_id'),
133133
'egg_id' => array_get($data, 'egg_id'),

resources/themes/pterodactyl/admin/servers/new.blade.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,9 @@
121121
<span class="input-group-addon">MB</span>
122122
</div>
123123
</div>
124-
<div class="form-group col-sm-4">
125-
<label for="pOOMDisabled">Out-of-Memory Killer</label>
126-
<div class="input-group">
127-
<span class="input-group-addon">
128-
<input type="checkbox" id="pOOMDisabled" name="oom_disabled"/>
129-
</span>
130-
<input type="text" class="form-control" readonly style="background:transparent !important;" value="Disable OOM Killer" />
131-
</div>
132-
</div>
133124
</div>
134125
<div class="box-footer no-border no-pad-top no-pad-bottom">
135-
<p class="text-muted small">If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field. We suggest leaving OOM Killer enabled unless you know what you are doing, disabling it could cause your server to hang unexpectedly.<p>
126+
<p class="text-muted small">If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field.<p>
136127
</div>
137128
<div class="box-body row">
138129
<div class="form-group col-sm-4">

0 commit comments

Comments
 (0)