From f05cf8385328443fb89afcc0240bf1e9d3a9da74 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 28 Jun 2020 20:32:18 +1000
Subject: [PATCH] Fixes for setup process

---
 app/Http/Middleware/QueryLogging.php | 2 +-
 app/Utils/SystemHealth.php           | 2 +-
 app/Utils/Traits/AppSetup.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 0c29045eeeef..659612e4d831 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -48,7 +48,7 @@ class QueryLogging
                 $timeEnd = microtime(true);
                 $time = $timeEnd - $timeStart;
             
-                Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
+            //    Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
                 
              //if($count > 10)
              //    Log::info($queries);
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 87cbb8ba81ac..d7fddd80df7c 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -52,6 +52,7 @@ class SystemHealth
         } elseif (phpversion() < self::$php_version) {
             $system_health = "false";
         } elseif(!self::simpleDbCheck()) {
+            info("db fails");
             $system_health = "false";
         }
 
@@ -79,7 +80,6 @@ class SystemHealth
         catch (\Exception $e) {
             $result = false;
         }
-            info("returning false");
 
         return $result;
     }
diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php
index e0469f9d7e38..870a91d5df32 100644
--- a/app/Utils/Traits/AppSetup.php
+++ b/app/Utils/Traits/AppSetup.php
@@ -24,6 +24,6 @@ trait AppSetup
         
         $check = SystemHealth::check();
 
-        return $check == "true";
+        return $check['system_health'] == "true";
     }
 }