minor fix

Author: sarfrazonsupport

src/Console/ServerMonitorCommand.php

@@ -3,6 +3,7 @@
 namespace Sarfraznawaz2005\Meter\Console;
 
 use Illuminate\Console\Command;
+use Sarfraznawaz2005\Meter\Meter;
 use Sarfraznawaz2005\Meter\Monitors\CpuMonitor;
 use Sarfraznawaz2005\Meter\Monitors\DiskSpaceMonitor;
 use Sarfraznawaz2005\Meter\Monitors\HttpConnectionsMonitor;
@@ -13,22 +14,24 @@ class ServerMonitorCommand extends Command
     protected $signature = 'meter:servermonitor';
     protected $description = 'Checks server stuff such as disk space, cpu usage, memory, etc';
 
+    public static $serverMonitors = [
+        CpuMonitor::class,
+        DiskSpaceMonitor::class,
+        MemoryMonitor::class,
+        HttpConnectionsMonitor::class,
+    ];
+
     public function handle()
     {
-        $app = app();
-
-        $serverMonitors = [
-            CpuMonitor::class,
-            DiskSpaceMonitor::class,
-            MemoryMonitor::class,
-            HttpConnectionsMonitor::class,
-        ];
+        if (Meter::isMonitoring()) {
+            $app = app();
 
-        foreach ($serverMonitors as $monitor) {
-            if (config('meter.monitors.' . $monitor . '.enabled', true)) {
-                $monitor = $app->make($monitor);
+            foreach (static::$serverMonitors as $monitor) {
+                if (config('meter.monitors.' . $monitor . '.enabled', true)) {
+                    $monitor = $app->make($monitor);
 
-                $monitor->register($app);
+                    $monitor->register($app);
+                }
             }
         }
     }

src/Traits/RegistersMonitors.php

@@ -3,6 +3,7 @@
 namespace Sarfraznawaz2005\Meter\Traits;
 
 use Illuminate\Contracts\Foundation\Application;
+use Sarfraznawaz2005\Meter\Console\ServerMonitorCommand;
 
 trait RegistersMonitors
 {
@@ -32,6 +33,8 @@ public static function hasMonitor($class): bool
      */
     protected static function registerMonitors($app)
     {
+        $serverMonitors = ServerMonitorCommand::$serverMonitors;
+
         foreach (config('meter.monitors') as $key => $monitor) {
 
             if (is_string($key) && $monitor === false) {
@@ -46,7 +49,15 @@ protected static function registerMonitors($app)
                 'options' => is_array($monitor) ? $monitor : [],
             ]);
 
-            static::$monitors[] = get_class($monitor);
+            $class = get_class($monitor);
+
+            // exclude server monitors
+            if (in_array($class, $serverMonitors, true)) {
+                unset($monitor);
+                continue;
+            }
+
+            static::$monitors[] = $class;
 
             $monitor->register($app);
         }