drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jobs

Browse Source
This commit is contained in:
drkthunder02
2019-08-01 22:30:12 -05:00
parent b09f48ccdc
commit 7a2701d72d
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/Moons/MoonMailer.php
View File

@@ -7,7 +7,7 @@ use Carbon\Carbon;
use DB;
//Jobs
use App\Jobs\SendEveMailJob;
use App\Jobs\ProcessSendEveMailJob;
//Library
use Commands\Library\CommandHelper;
@@ -107,7 +107,7 @@ class MoonMailerCommand extends Command
$mail->body = $body;
$mail->recipient = (int)$contact->Contact;
$mail->recipient_type = 'character';
SendEveMailJob::dispatch($mail)->onQueue('mail')->delay($delay);
ProcessSendEveMailJob::dispatch($mail)->onQueue('mail')->delay($delay);
//Increment the delay for the mail to not hit rate limits
$delay += 30;

6
app/Http/Controllers/Contracts/ContractAdminController.php
View File

@@ -11,7 +11,7 @@ use Carbon\Carbon;
use App\Library\Esi\Mail;
//Jobs
use App\Jobs\SendEveMailJob;
use App\Jobs\ProcessSendEveMailJob;
//Models
use App\Models\User\User;
@@ -163,7 +163,7 @@ class ContractAdminController extends Controller
$mail->body = $body;
$mail->sender = $config['primary'];
//Dispatch the mail job
SendEveMailJob::dispatch($mail)->onQueue('mail');
ProcessSendEveMailJob::dispatch($mail)->onQueue('mail');
//Tidy up the contract by doing a few things.
$this->TidyContract($contract, $bid);
@@ -201,7 +201,7 @@ class ContractAdminController extends Controller
$mail->recipient = $user['character_id'];
$mail->recipient_type = 'character';
$mail->body = "A new contract is available for the alliance contracting system. Please check out <a href='https://services.w4rp.space'>Services Site</a>.";
SendEveMailJob::dispatch($mail)->onQueue('mail');
ProcessSendEveMailJob::dispatch($mail)->onQueue('mail');
}
}
}

2
app/Jobs/ProcessSendEveMailJob.php
View File

@@ -61,7 +61,7 @@ class ProcessSendEveMailJob implements ShouldQueue
/**
* Execute the job.
* Utilized by using SendEveMailJob::dispatch($mail);
* Utilized by using ProcessSendEveMailJob::dispatch($mail);
* The model is passed into the dispatch function, then added to the queue
* for processing.
*

8
app/Library/Esi/Esi.php
View File

@@ -13,7 +13,7 @@ use App\Models\Jobs\JobSendEveMail;
use App\Models\Mail\EveMail;
//Jobs
use App\Jobs\SendEveMailJob;
use App\Jobs\ProcessSendEveMailJob;
//Seat Stuff
use Seat\Eseye\Cache\NullCache;
@@ -52,7 +52,7 @@ class Esi {
$mail->recipient = (int)$charId;
$mail->recipient_type = 'character';
SendEveMailJob::dispatch($mail)->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
ProcessSendEveMailJob::dispatch($mail)->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
return false;
}
@@ -170,7 +170,7 @@ class Esi {
$mail->body = "Please register at https://services.w4rp.space with the scope: " . $scope;
$mail->recipient = (int)$charId;
$mail->recipient_type = 'character';
SendEveMailJob::dispatch($mail)->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
ProcessSendEveMailJob::dispatch($mail)->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
return null;
}
@@ -192,7 +192,7 @@ class Esi {
$mail->recipient = (int)$charId;
$mail->recipient_type = 'character';
SendEveMailJob::dispatch($mail)->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
ProcessSendEveMailJob::dispatch($mail)->onQueue('mail')->delay(Carbon::now()->addSeconds(5));
return null;
} else {

2
app/Library/Finances/Helper/FinanceHelper.php
View File

@@ -12,7 +12,7 @@ use DB;
use Log;
//Job
use App\Jobs\SendEveMailJob;
use App\Jobs\ProcessSendEveMailJob;
//Models
use App\Models\Esi\EsiToken;

5
vendor/composer/autoload_classmap.php vendored
View File

@@ -9,6 +9,7 @@ return array(
'App\\Charts\\StructureFuelGauge' => $baseDir . '/app/Charts/StructureFuelGauge.php',
'App\\Console\\Commands\\CleanStaleDataCommand' => $baseDir . '/app/Console/Commands/Data/CleanStaleDataCommand.php',
'App\\Console\\Commands\\CorpFinances' => $baseDir . '/app/Console/Commands/Finances/CorpFinances.php',
'App\\Console\\Commands\\CorpMarketMail' => $baseDir . '/app/Console/Commands/Finances/CorpMarketMail.php',
'App\\Console\\Commands\\GetAssetsCommand' => $baseDir . '/app/Console/Commands/Assets/GetAssets.php',
'App\\Console\\Commands\\GetCorpsCommand' => $baseDir . '/app/Console/Commands/Corps/GetCorps.php',
'App\\Console\\Commands\\GetEveContractsCommand' => $baseDir . '/app/Console/Commands/Logistics/GetEveContracts.php',
@@ -19,6 +20,7 @@ return array(
'App\\Console\\Commands\\UpdateMoonPriceCommand' => $baseDir . '/app/Console/Commands/Moons/UpdateMoonPricing.php',
'App\\Console\\Commands\\UpdateMoonRental' => $baseDir . '/app/Console/Commands/Moons/UpdateMoonRental.php',
'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
'App\\CorpMarketStructure' => $baseDir . '/app/Models/Finances/CorpMarketStructure.php',
'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
'App\\Http\\Controllers\\Auth\\EsiScopeController' => $baseDir . '/app/Http/Controllers/Auth/EsiScopeController.php',
'App\\Http\\Controllers\\Auth\\LoginController' => $baseDir . '/app/Http/Controllers/Auth/LoginController.php',
@@ -30,7 +32,7 @@ return array(
'App\\Http\\Controllers\\Fuel\\FuelController' => $baseDir . '/app/Http/Controllers/Logistics/FuelController.php',
'App\\Http\\Controllers\\LiveSearch' => $baseDir . '/app/Http/Controllers/LiveSearch.php',
'App\\Http\\Controllers\\Logistics\\LogisticsController' => $baseDir . '/app/Http/Controllers/Logistics/LogisticsController.php',
'App\\Http\\Controllers\\MarketController' => $baseDir . '/app/Http/Controllers/Market/MarketController.php',
'App\\Http\\Controllers\\Market\\MarketController' => $baseDir . '/app/Http/Controllers/Market/MarketController.php',
'App\\Http\\Controllers\\Moons\\MoonsAdminController' => $baseDir . '/app/Http/Controllers/Moons/MoonsAdminController.php',
'App\\Http\\Controllers\\Moons\\MoonsController' => $baseDir . '/app/Http/Controllers/Moons/MoonsController.php',
'App\\Http\\Controllers\\SRP\\SRPAdminController' => $baseDir . '/app/Http/Controllers/SRP/SRPAdminController.php',
@@ -51,6 +53,7 @@ return array(
'App\\Jobs\\ProcessAssetsJob' => $baseDir . '/app/Jobs/ProcessAssetsJob.php',
'App\\Jobs\\ProcessCorpJournalJob' => $baseDir . '/app/Jobs/ProcessCorpJournalJob.php',
'App\\Jobs\\ProcessEveContractsJob' => $baseDir . '/app/Jobs/ProcessEveContractsJob.php',
'App\\Jobs\\ProcessSendEveMailJob' => $baseDir . '/app/Jobs/ProcessSendEveMailJob.php',
'App\\Jobs\\ProcessStructureJob' => $baseDir . '/app/Jobs/ProcessStructureJob.php',
'App\\Jobs\\ProcessWalletJournalJob' => $baseDir . '/app/Jobs/ProcessWalletJournalJob.php',
'App\\Jobs\\ProcessWalletTransactionJob' => $baseDir . '/app/Jobs/ProcessWallettransactionJob.php',

5
vendor/composer/autoload_static.php vendored
View File

@@ -472,6 +472,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Charts\\StructureFuelGauge' => __DIR__ . '/../..' . '/app/Charts/StructureFuelGauge.php',
'App\\Console\\Commands\\CleanStaleDataCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Data/CleanStaleDataCommand.php',
'App\\Console\\Commands\\CorpFinances' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/CorpFinances.php',
'App\\Console\\Commands\\CorpMarketMail' => __DIR__ . '/../..' . '/app/Console/Commands/Finances/CorpMarketMail.php',
'App\\Console\\Commands\\GetAssetsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Assets/GetAssets.php',
'App\\Console\\Commands\\GetCorpsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Corps/GetCorps.php',
'App\\Console\\Commands\\GetEveContractsCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Logistics/GetEveContracts.php',
@@ -482,6 +483,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Console\\Commands\\UpdateMoonPriceCommand' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/UpdateMoonPricing.php',
'App\\Console\\Commands\\UpdateMoonRental' => __DIR__ . '/../..' . '/app/Console/Commands/Moons/UpdateMoonRental.php',
'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
'App\\CorpMarketStructure' => __DIR__ . '/../..' . '/app/Models/Finances/CorpMarketStructure.php',
'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
'App\\Http\\Controllers\\Auth\\EsiScopeController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/EsiScopeController.php',
'App\\Http\\Controllers\\Auth\\LoginController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/LoginController.php',
@@ -493,7 +495,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Http\\Controllers\\Fuel\\FuelController' => __DIR__ . '/../..' . '/app/Http/Controllers/Logistics/FuelController.php',
'App\\Http\\Controllers\\LiveSearch' => __DIR__ . '/../..' . '/app/Http/Controllers/LiveSearch.php',
'App\\Http\\Controllers\\Logistics\\LogisticsController' => __DIR__ . '/../..' . '/app/Http/Controllers/Logistics/LogisticsController.php',
'App\\Http\\Controllers\\MarketController' => __DIR__ . '/../..' . '/app/Http/Controllers/Market/MarketController.php',
'App\\Http\\Controllers\\Market\\MarketController' => __DIR__ . '/../..' . '/app/Http/Controllers/Market/MarketController.php',
'App\\Http\\Controllers\\Moons\\MoonsAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/Moons/MoonsAdminController.php',
'App\\Http\\Controllers\\Moons\\MoonsController' => __DIR__ . '/../..' . '/app/Http/Controllers/Moons/MoonsController.php',
'App\\Http\\Controllers\\SRP\\SRPAdminController' => __DIR__ . '/../..' . '/app/Http/Controllers/SRP/SRPAdminController.php',
@@ -514,6 +516,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
'App\\Jobs\\ProcessAssetsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessAssetsJob.php',
'App\\Jobs\\ProcessCorpJournalJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessCorpJournalJob.php',
'App\\Jobs\\ProcessEveContractsJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessEveContractsJob.php',
'App\\Jobs\\ProcessSendEveMailJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessSendEveMailJob.php',
'App\\Jobs\\ProcessStructureJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessStructureJob.php',
'App\\Jobs\\ProcessWalletJournalJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessWalletJournalJob.php',
'App\\Jobs\\ProcessWalletTransactionJob' => __DIR__ . '/../..' . '/app/Jobs/ProcessWallettransactionJob.php',