added assets queue

app/Console/Commands/Structures/ExecuteFetchAllianceAssetsCommand.php

@@ -39,7 +39,7 @@ class ExecuteFetchAllianceAssetsCommand extends Command
      */
     public function handle()
     {
-        FAA::dispatch()->onQueue('assets');
+        FAA::dispatch();
 
         return 0;
     }

app/Console/Commands/Structures/ExecuteFetchAllianceStructuresCommand.php

@@ -39,7 +39,7 @@ class ExecuteFetchAllianceStructuresCommand extends Command
      */
     public function handle()
     {
-        FAS::dispatch()->onQueue('structures');
+        FAS::dispatch();
 
         return 0;
     }

app/Jobs/Commands/Assets/FetchAllianceAssets.php

@@ -44,7 +44,7 @@ class FetchAllianceAssets implements ShouldQueue
     {
         //Set the connection for the job
         $this->connection = 'redis';
-        $this->onQueue('structures');
+        $this->onQueue('assets');
         
     }
 
@@ -89,7 +89,7 @@ class FetchAllianceAssets implements ShouldQueue
 
             //For each asset retrieved, let's process it.
             foreach($assets as $a) {
-                ProcessAllianceAssets::dispatch($a)->onQueue('structures');
+                ProcessAllianceAssets::dispatch($a);
             }
 
             //Increment the current page

app/Jobs/Commands/Assets/ProcessAllianceAssets.php

@@ -42,7 +42,7 @@ class ProcessAllianceAssets implements ShouldQueue
     {
         //Set the connection for the job
         $this->connection = 'redis';
-        $this->onQueue('structures');
+        $this->onQueue('assets');
 
         $this->asset = $a;
     }
@@ -94,4 +94,13 @@ class ProcessAllianceAssets implements ShouldQueue
             }
         }
     }
+
+    /**
+     * Tags for jobs
+     * 
+     * @var array
+     */
+    public function tags() {
+        return ['FetchAllianceAssets', 'AllianceStructures', 'Assets'];
+    }
 }

app/Jobs/Commands/Assets/PurgeAllianceAssets.php

@@ -42,7 +42,7 @@ class PurgeAllianceAssets implements ShouldQueue
     {
         //Set the connection for the job
         $this->connection = 'redis';
-        $this->onQueue('structures');
+        $this->onQueue('assets');
     }
 
     /**
@@ -54,6 +54,6 @@ class PurgeAllianceAssets implements ShouldQueue
     {
         Asset::truncate();
 
-        FetchAllianceAssets::dispatch()->onQueue('structures');
+        FetchAllianceAssets::dispatch();
     }
 }

app/Jobs/Commands/Structures/FetchAllianceStructures.php

@@ -45,6 +45,7 @@ class FetchAllianceStructures implements ShouldQueue
     {
         //Set the connection for the job
         $this->connection = 'redis';
+        $this->onQueue('structures');
 
     }
 

app/Jobs/Commands/Structures/PurgeAllianceStructures.php

@@ -56,6 +56,15 @@ class PurgeAllianceStructures implements ShouldQueue
         Structure::truncate();
         Service::truncate();
 
-        FetchAllianceStructures::dispatch()->onQueue('structures');
+        FetchAllianceStructures::dispatch();
+    }
+
+    /**
+     * Set the tags for the job
+     * 
+     * @var array
+     */
+    public function tags() {
+        return ['PurgeAllianceStructures', 'AllianceStructures', 'Structures'];
     }
 }

config/horizon.php

@@ -150,9 +150,10 @@ return [
                     'miningtaxes',
                     'structures',
                     'finances',
+                    'assets',
                 ],
                 'balance' => 'auto',
-                'processes' => 12,
+                'processes' => 14,
                 'minProcesses' => 1,
                 'maxProcesses' => 10,
                 'balanceMaxShift' => 2,
@@ -171,9 +172,10 @@ return [
                     'miningtaxes',
                     'structures',
                     'finances',
+                    'assets',
                 ],
                 'balance' => 'auto',
-                'processes' => 12,
+                'processes' => 14,
                 'minProcesses' => 1,
                 'maxProcesses' => 10,
                 'balanceMaxShift' => 2,