Refactor cache

turbo124 · Apr 24, 2020 · d28db90 · d28db90
1 parent 7c45cbc
commit d28db90
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/Collector.php b/src/Collector.php
@@ -58,9 +58,8 @@ public function queue()
 
     public function batch()
     {
-        config(['cache.default' => 'array']);
 
-        $data = Cache::tags(['collector'])->get('collector');
+        $data = Cache::get('collector');
 
         if(is_array($data)){
             $data[] = $this->metric;
@@ -70,6 +69,6 @@ public function batch()
             $data[] = $this->metric;
         }
 
-        Cache::tags(['collector'])->put('collector', $data);
+        Cache::put('collector', $data);
     }
 }
diff --git a/src/Jobs/BatchMetrics.php b/src/Jobs/BatchMetrics.php
@@ -29,14 +29,12 @@ public function __construct()
     public function handle()
     {
 
-        config(['cache.default' => 'array']);
-
-        $metrics = Cache::tags(['collector'])->get('collector');
+        $metrics = Cache::get('collector');
 
         $generator = new Generator();
         $generator->batchFire($metrics);
 
-        Cache::tags(['collector'])->flush();
+        Cache::forget('collector');
 
     }
 }
diff --git a/src/Jobs/CreateMetric.php b/src/Jobs/CreateMetric.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\Request;
+use Turbo124\Collector\Collector\Generator;
 
 class CreateMetric
 {
@@ -29,6 +30,7 @@ public function __construct($metric)
      */
     public function handle()
     {
-
+        $generator = new Generator();
+        $generator->fire($this->metric);
     }
 }
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
@@ -15,9 +15,7 @@ public function testCacheGetAndPut()
 	{
 		$test_array = ['a' => 'b', 'c'=>'d'];
 
-        config(['cache.default' => 'array']);
-
-        $data = Cache::tags(['collector'])->get('collector');
+        $data = Cache::get('collector');
 
         if(is_array($data)){
             $data[] = $test_array;
@@ -27,9 +25,9 @@ public function testCacheGetAndPut()
             $data[] = $test_array;
         }
 
-        Cache::tags(['collector'])->put('collector', $data);
+        Cache::put('collector', $data);
 
-        $test_data = Cache::tags(['collector'])->get('collector');
+        $test_data = Cache::get('collector');
 
         $this->assertTrue(is_array($test_data));