From ffe73b77af2ac9e3d4f71b041c3b091b19645e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 28 Jul 2020 14:41:10 +0200 Subject: [PATCH 1/2] Undo setup changes --- app/Utils/SystemHealth.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index b752c377647c..bc4fbcd1602d 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -90,13 +90,14 @@ class SystemHealth exec('node -v', $foo, $exitCode); if ($exitCode === 0) { - return true; + return $foo[0]; } - - return false; + } catch (\Exception $e) { - return false; + + return false; } + } public static function checkNpm() @@ -105,14 +106,14 @@ class SystemHealth exec('npm -v', $foo, $exitCode); if ($exitCode === 0) { - return true; - } + return $foo[0]; + } - return false; - - } catch (\Exception $e) { - return false; + }catch (\Exception $e) { + + return false; } + } private static function simpleDbCheck() :bool From b28a48b1d9edf5b5a6d46fb7c060fba878aed2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 28 Jul 2020 14:42:53 +0200 Subject: [PATCH 2/2] undo --- app/Utils/SystemHealth.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index bc4fbcd1602d..6e7eb880b66f 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -60,14 +60,6 @@ class SystemHealth $system_health = false; } - if (!self::checkNode()) { - $system_health = false; - } - - if (!self::checkNpm()) { - $system_health = false; - } - return [ 'system_health' => $system_health, 'extensions' => self::extensions(),