From a32d42feabd0ef278d195c961f9a88b3d4c93d88 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Sun, 7 May 2023 21:41:26 +0200 Subject: [PATCH] OOM Killer --- app/Http/Controllers/Admin/ProductController.php | 7 +++++-- themes/default/views/servers/index.blade.php | 2 +- themes/default/views/servers/settings.blade.php | 12 ++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index c05a1303..33d98c50 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -91,8 +91,10 @@ class ProductController extends Controller 'oom_killer' => 'nullable', ]); + $disabled = ! is_null($request->input('disabled')); - $product = Product::create(array_merge($request->all(), ['disabled' => $disabled])); + $oomkiller = ! is_null($request->input('oom_killer')); + $product = Product::create(array_merge($request->all(), ['disabled' => $disabled, 'oom_killer' => $oomkiller])); //link nodes and eggs $product->eggs()->attach($request->input('eggs')); @@ -165,7 +167,8 @@ class ProductController extends Controller ]); $disabled = ! is_null($request->input('disabled')); - $product->update(array_merge($request->all(), ['disabled' => $disabled])); + $oomkiller = ! is_null($request->input('oom_killer')); + $product->update(array_merge($request->all(), ['disabled' => $disabled, 'oom_killer' => $oomkiller])); //link nodes and eggs $product->eggs()->detach(); diff --git a/themes/default/views/servers/index.blade.php b/themes/default/views/servers/index.blade.php index df47ae53..93f31b7d 100644 --- a/themes/default/views/servers/index.blade.php +++ b/themes/default/views/servers/index.blade.php @@ -103,7 +103,7 @@ {{ $server->product->name }} " class="fas fa-info-circle"> diff --git a/themes/default/views/servers/settings.blade.php b/themes/default/views/servers/settings.blade.php index 4ef71744..9525cd23 100644 --- a/themes/default/views/servers/settings.blade.php +++ b/themes/default/views/servers/settings.blade.php @@ -204,6 +204,18 @@ +
+
+
+ +
+
+ + {{ $server->product->oom_killer ? __("enabled") : __("disabled") }} + +
+
+