From 38176274ff642db8544fa5569599d4b27955d9d2 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Tue, 30 Mar 2021 20:44:29 +0900 Subject: [PATCH] connection stuff --- app/Jobs/Commands/Data/PurgeUsersJob.php | 2 +- app/Jobs/Commands/Eve/ItemPricesUpdateJob.php | 7 +------ app/Jobs/Commands/Eve/ProcessSendEveMailJob.php | 7 +------ app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php | 7 +------ .../Commands/Finances/UpdateAllianceWalletJournalJob.php | 2 +- app/Jobs/Commands/Finances/UpdateItemPricesJob.php | 2 +- .../Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php | 7 +------ .../Commands/MiningTaxes/FetchMiningTaxesObserversJob.php | 2 +- .../Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php | 7 +------ .../Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php | 7 +------ .../Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php | 2 +- .../Commands/SupplyChain/EndSupplyChainContractJob.php | 7 +------ 12 files changed, 12 insertions(+), 47 deletions(-) diff --git a/app/Jobs/Commands/Data/PurgeUsersJob.php b/app/Jobs/Commands/Data/PurgeUsersJob.php index 855512816..5ce8d2218 100644 --- a/app/Jobs/Commands/Data/PurgeUsersJob.php +++ b/app/Jobs/Commands/Data/PurgeUsersJob.php @@ -48,7 +48,7 @@ class PurgeUsersJob implements ShouldQueue */ public function __construct() { - // + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php b/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php index 56f62aefc..5f842ddf9 100644 --- a/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php +++ b/app/Jobs/Commands/Eve/ItemPricesUpdateJob.php @@ -16,11 +16,6 @@ class ItemPricesUpdateJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Create a new job instance. * @@ -28,7 +23,7 @@ class ItemPricesUpdateJob implements ShouldQueue */ public function __construct() { - // + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/Eve/ProcessSendEveMailJob.php b/app/Jobs/Commands/Eve/ProcessSendEveMailJob.php index 2732c0c85..4e2f46be4 100644 --- a/app/Jobs/Commands/Eve/ProcessSendEveMailJob.php +++ b/app/Jobs/Commands/Eve/ProcessSendEveMailJob.php @@ -29,11 +29,6 @@ class ProcessSendEveMailJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Retries * With new rate limiting, we need a retry basis versus timeout basis @@ -54,7 +49,7 @@ class ProcessSendEveMailJob implements ShouldQueue */ public function __construct($body, $recipient, $recipient_type, $subject, $sender) { //Set the connection - //$this->connection = 'redis'; + $this->connection = 'redis'; //Set the middleware for the job $this->middleware = $this->middleware(); diff --git a/app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php b/app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php index b25a7e046..03025b710 100644 --- a/app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php +++ b/app/Jobs/Commands/Eve/ProcessSendEveMailJobRL.php @@ -28,11 +28,6 @@ class ProcessSendEveMailJobRL implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Timeout in seconds * With new rate limiting, we shouldn't use this timeout @@ -60,7 +55,7 @@ class ProcessSendEveMailJobRL implements ShouldQueue */ public function __construct($body, $recipient, $recipient_type, $subject, $sender) { //Set the connection - //$this->connection = 'redis'; + $this->connection = 'redis'; diff --git a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php index e9275414c..2fa3636af 100644 --- a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php +++ b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php @@ -42,7 +42,7 @@ class UpdateAllianceWalletJournalJob implements ShouldQueue */ public function __construct() { - // + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/Finances/UpdateItemPricesJob.php b/app/Jobs/Commands/Finances/UpdateItemPricesJob.php index 12679700f..2335d2c39 100644 --- a/app/Jobs/Commands/Finances/UpdateItemPricesJob.php +++ b/app/Jobs/Commands/Finances/UpdateItemPricesJob.php @@ -35,7 +35,7 @@ class UpdateItemPricesJob implements ShouldQueue */ public function __construct() { - // + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php index 759e89335..1e0a85b17 100644 --- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php +++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php @@ -31,11 +31,6 @@ class FetchMiningTaxesLedgersJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Timeout in seconds * @@ -65,7 +60,7 @@ class FetchMiningTaxesLedgersJob implements ShouldQueue public function __construct($charId, $corpId, $observerId) { //Set the connection for the job - //$this->connection = 'redis'; + $this->connection = 'redis'; //Import the variables from the calling function $this->charId = $charId; diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php index cc8961606..4c930ef1f 100644 --- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php +++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php @@ -41,7 +41,7 @@ class FetchMiningTaxesObserversJob implements ShouldQueue */ public function __construct() { - // + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php index 5c1fa0b15..268afd983 100644 --- a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php +++ b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesLedgersJob.php @@ -23,11 +23,6 @@ class ProcessMiningTaxesLedgersJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Timeout in seconds * @@ -56,7 +51,7 @@ class ProcessMiningTaxesLedgersJob implements ShouldQueue public function __construct($ledger, $observerId) { //Set the connection for the job - //$this->connection = 'redis'; + $this->connection = 'redis'; //Import variables from the calling function $this->ledger = $ledger; diff --git a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php index fb54c8f13..033564416 100644 --- a/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php +++ b/app/Jobs/Commands/MiningTaxes/ProcessMiningTaxesPaymentsJob.php @@ -23,11 +23,6 @@ class ProcessMiningTaxesPaymentsJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Create a new job instance. * @@ -35,7 +30,7 @@ class ProcessMiningTaxesPaymentsJob implements ShouldQueue */ public function __construct() { - //$this->connection = 'redis'; + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php b/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php index 79e01ba62..b3a09f4fa 100644 --- a/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php +++ b/app/Jobs/Commands/MiningTaxes/SendMiningTaxesInvoicesJob.php @@ -48,7 +48,7 @@ class SendMiningTaxesInvoicesJob implements ShouldQueue */ public function __construct() { - // + $this->connection = 'redis'; } /** diff --git a/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php b/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php index 58fec9e63..3bab6f07a 100644 --- a/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php +++ b/app/Jobs/Commands/SupplyChain/EndSupplyChainContractJob.php @@ -24,11 +24,6 @@ class EndSupplyChainContractJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - /** - * The queue connection that should handle the job - */ - public $connection = 'queue'; - /** * Timeout in seconds * @@ -64,7 +59,7 @@ class EndSupplyChainContractJob implements ShouldQueue public function __construct(SupplyChainContract $contract) { //Set the queue connection up - //$this->connection = 'redis'; + $this->connection = 'redis'; //Set the variables $contractId = $contract->contract_id;