Fixes for returning too early

turbo124 · May 8, 2020 · 2797b47 · 2797b47
1 parent 232a59b
commit 2797b47
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Commands/ForceSend.php b/src/Commands/ForceSend.php
@@ -4,6 +4,7 @@
 
 use App;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
 use Turbo124\Beacon\Jobs\BatchMetrics;
 
 
@@ -19,7 +20,7 @@ class ForceSend extends Command
      */
     protected $description = 'Forces the beacon queue to send data to the endpoint.';
 
-
+    protected $log = '';
 
     public function handle()
     {
@@ -30,9 +31,11 @@ public function handle()
         foreach($metric_types as $type)
         {
             $metrics = Cache::get(config('beacon.cache_key') . '_' . $type);
-        }
 
-        $this->logMessage("I have " . count($metrics) . "pending to be sent");
+            if(is_array($metrics))
+                $this->logMessage("I have " . count($metrics) . "pending to be sent");
+
+        }
 
         BatchMetrics::dispatchNow();
 
@@ -41,9 +44,13 @@ public function handle()
         foreach($metric_types as $type)
         {
             $metrics = Cache::get(config('beacon.cache_key') . '_' . $type);
+
+            if(is_array($metrics))
+                $this->logMessage("I have " . count($metrics) . "pending to be sent");
         }
 
-        $this->logMessage("I have " . count($metrics) . "pending to be sent");
+
+
     }
 
     private function logMessage($str)

diff --git a/src/Jobs/BatchMetrics.php b/src/Jobs/BatchMetrics.php
@@ -38,7 +38,7 @@ public function handle()
             $metrics = Cache::get(config('beacon.cache_key') . '_' . $type);
 
             if(!is_array($metrics))
-                return;
+                continue;
 
             $generator = new Generator();
             $generator->batchFire($metrics);