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

job updates

Browse Source
This commit is contained in:
drkthunder02
2021-05-30 21:57:45 +09:00
parent 565693d911
commit 1be8be97aa
3 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Jobs/Commands/Assets/FetchAllianceAssets.php
View File

@@ -114,43 +114,45 @@ class FetchAllianceAssets implements ShouldQueue
(is_string($exception->getEsiResponse()) && (stristr($exception->getEsiResponse(), 'Too many errors') || stristr($exception->getEsiResponse(), 'This software has exceeded the error limit for ESI')))) { (is_string($exception->getEsiResponse()) && (stristr($exception->getEsiResponse(), 'Too many errors') || stristr($exception->getEsiResponse(), 'This software has exceeded the error limit for ESI')))) {
//We have hit the error rate limiter, wait 120 seconds before releasing the job back into the queue. //We have hit the error rate limiter, wait 120 seconds before releasing the job back into the queue.
Log::info('FetchMiningTaxesObservers has hit the error rate limiter. Releasing the job back into the wild in 2 minutes.'); Log::info('FetchAllianceAssets has hit the error rate limiter. Releasing the job back into the wild in 2 minutes.');
$this->release(120); $this->release(120);
} else { } else {
$errorCode = $exception->getEsiResponse()->getErrorCode(); $errorCode = $exception->getEsiResponse()->getErrorCode();
switch($errorCode) { switch($errorCode) {
case 400: //Bad Request case 400: //Bad Request
Log::critical("Bad request has occurred in FetchMiningTaxesObservers. Job has been discarded"); Log::critical("Bad request has occurred in FetchAllianceAssets. Job has been discarded");
break; break;
case 401: //Unauthorized Request case 401: //Unauthorized Request
Log::critical("Unauthorized request has occurred in FetchMiningTaxesObservers at " . Carbon::now()->toDateTimeString() . ".\r\nCancelling the job."); Log::critical("Unauthorized request has occurred in FetchAllianceAssets at " . Carbon::now()->toDateTimeString() . ".\r\nCancelling the job.");
$this->delete();
break; break;
case 403: //Forbidden case 403: //Forbidden
Log::critical("FetchMiningTaxesObservers has incurred a forbidden error. Cancelling the job."); Log::critical("FetchAllianceAssets has incurred a forbidden error. Cancelling the job.");
$this->delete();
break; break;
case 420: //Error Limited case 420: //Error Limited
Log::warning("Error rate limit occurred in FetchMiningTaxesObservers. Restarting job in 120 seconds."); Log::warning("Error rate limit occurred in FetchAllianceAssets. Restarting job in 120 seconds.");
$this->release(120); $this->release(120);
break; break;
case 500: //Internal Server Error case 500: //Internal Server Error
Log::critical("Internal Server Error for ESI in FetchMiningTaxesObservers. Attempting a restart in 120 seconds."); Log::critical("Internal Server Error for ESI in FetchAllianceAssets. Attempting a restart in 120 seconds.");
$this->release(120); $this->release(120);
break; break;
case 503: //Service Unavailable case 503: //Service Unavailable
Log::critical("Service Unavailabe for ESI in FetchMiningTaxesObservers. Releasing the job back to the queue in 30 seconds."); Log::critical("Service Unavailabe for ESI in FetchAllianceAssets. Releasing the job back to the queue in 30 seconds.");
$this->release(30); $this->release(30);
break; break;
case 504: //Gateway Timeout case 504: //Gateway Timeout
Log::critical("Gateway timeout in FetchMiningTaxesObservers. Releasing the job back to the queue in 30 seconds."); Log::critical("Gateway timeout in FetchAllianceAssets. Releasing the job back to the queue in 30 seconds.");
$this->release(30); $this->release(30);
break; break;
case 201: //Good response code case 201:
$this->delete(); //Good response code
break; break;
//If no code is given, then log and break out of switch. //If no code is given, then log and break out of switch.
default: default:
Log::warning("No response code received from esi call in FetchMiningTaxesObservers.\r\n"); Log::warning("No response code received from esi call in FetchAllianceAssets.\r\n");
$this->delete(); $this->delete();
break; break;
} }

14
app/Jobs/Commands/Data/PurgeUsers.php
View File

@@ -173,18 +173,20 @@ class PurgeUsers implements ShouldQueue
])->delete(); ])->delete();
} }
//Delete the user from the user table //Delete the user's esi scopes
User::where([
'character_id' => $user->character_id,
])->delete();
EsiScope::where([ EsiScope::where([
'character_id' => $user->character_id, 'character_id' => $user->character_id,
])->delete(); ])->delete();
//Delete the user's esi token
EsiToken::where([ EsiToken::where([
'character_id' => $user->character_id, 'character_id' => $user->character_id,
])->delete(); ])->delete();
//Delete the user from the user table
User::where([
'character_id' => $user->character_id,
])->delete();
} }
} }
} }

22
app/Jobs/Commands/Structures/FetchAllianceStructures.php
View File

@@ -125,43 +125,43 @@ class FetchAllianceStructures implements ShouldQueue
(is_string($exception->getEsiResponse()) && (stristr($exception->getEsiResponse(), 'Too many errors') || stristr($exception->getEsiResponse(), 'This software has exceeded the error limit for ESI')))) { (is_string($exception->getEsiResponse()) && (stristr($exception->getEsiResponse(), 'Too many errors') || stristr($exception->getEsiResponse(), 'This software has exceeded the error limit for ESI')))) {
//We have hit the error rate limiter, wait 120 seconds before releasing the job back into the queue. //We have hit the error rate limiter, wait 120 seconds before releasing the job back into the queue.
Log::info('FetchMiningTaxesObservers has hit the error rate limiter. Releasing the job back into the wild in 2 minutes.'); Log::info('FetchAllianceStructures has hit the error rate limiter. Releasing the job back into the wild in 2 minutes.');
$this->release(120); $this->release(120);
} else { } else {
$errorCode = $exception->getEsiResponse()->getErrorCode(); $errorCode = $exception->getEsiResponse()->getErrorCode();
switch($errorCode) { switch($errorCode) {
case 400: //Bad Request case 400: //Bad Request
Log::critical("Bad request has occurred in FetchMiningTaxesObservers. Job has been discarded"); Log::critical("Bad request has occurred in FetchAllianceStructures. Job has been discarded");
break; break;
case 401: //Unauthorized Request case 401: //Unauthorized Request
Log::critical("Unauthorized request has occurred in FetchMiningTaxesObservers at " . Carbon::now()->toDateTimeString() . ".\r\nCancelling the job."); Log::critical("Unauthorized request has occurred in FetchAllianceStructures at " . Carbon::now()->toDateTimeString() . ".\r\nCancelling the job.");
break; break;
case 403: //Forbidden case 403: //Forbidden
Log::critical("FetchMiningTaxesObservers has incurred a forbidden error. Cancelling the job."); Log::critical("FetchAllianceStructures has incurred a forbidden error. Cancelling the job.");
break; break;
case 420: //Error Limited case 420: //Error Limited
Log::warning("Error rate limit occurred in FetchMiningTaxesObservers. Restarting job in 120 seconds."); Log::warning("Error rate limit occurred in FetchAllianceStructures. Restarting job in 120 seconds.");
$this->release(120); $this->release(120);
break; break;
case 500: //Internal Server Error case 500: //Internal Server Error
Log::critical("Internal Server Error for ESI in FetchMiningTaxesObservers. Attempting a restart in 120 seconds."); Log::critical("Internal Server Error for ESI in FetchAllianceStructures. Attempting a restart in 120 seconds.");
$this->release(120); $this->release(120);
break; break;
case 503: //Service Unavailable case 503: //Service Unavailable
Log::critical("Service Unavailabe for ESI in FetchMiningTaxesObservers. Releasing the job back to the queue in 30 seconds."); Log::critical("Service Unavailabe for ESI in FetchAllianceStructures. Releasing the job back to the queue in 30 seconds.");
$this->release(30); $this->release(30);
break; break;
case 504: //Gateway Timeout case 504: //Gateway Timeout
Log::critical("Gateway timeout in FetchMiningTaxesObservers. Releasing the job back to the queue in 30 seconds."); Log::critical("Gateway timeout in FetchAllianceStructures. Releasing the job back to the queue in 30 seconds.");
$this->release(30); $this->release(30);
break; break;
case 201: //Good response code case 201:
$this->delete(); //Good response code
break; break;
//If no code is given, then log and break out of switch. //If no code is given, then log and break out of switch.
default: default:
Log::warning("No response code received from esi call in FetchMiningTaxesObservers.\r\n"); Log::warning("No response code received from esi call in FetchAllianceStructures.\r\n");
$this->delete(); $this->delete();
break; break;
} }