malhuda/jikan-rest
1
0
Fork 0
mirror of https://github.com/jikan-me/jikan-rest.git synced 2025-02-20 11:23:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc. refactor

Browse Source
This commit is contained in:
Irfan 2020-09-13 13:00:56 +05:00
parent bdcd198f46
commit 7f804925c4
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Exceptions/Handler.php
View File

@ -130,9 +130,7 @@ class Handler extends ExceptionHandler
case 503:
case 504:
// Dispatch Bad source health event to prompt database fallback if enabled
if (env('SOURCE_BAD_HEALTH_FALLBACK') && env('DB_CACHING')) {
event(new SourceHeartbeatEvent(SourceHeartbeatEvent::BAD_HEALTH, $e->getCode()));
}
event(new SourceHeartbeatEvent(SourceHeartbeatEvent::BAD_HEALTH, $e->getCode()));
return response()
->json([

4
app/Http/Middleware/SourceHeartbeatMonitor.php
View File

@ -16,9 +16,7 @@ class SourceHeartbeatMonitor
*/
public function handle($request, Closure $next)
{
if (env('SOURCE_BAD_HEALTH_FAILOVER') && env('DB_CACHING')) {
event(new SourceHeartbeatEvent(SourceHeartbeatEvent::GOOD_HEALTH, 200));
}
event(new SourceHeartbeatEvent(SourceHeartbeatEvent::GOOD_HEALTH, 200));
return $next($request);
}

6
app/Listeners/SourceHealthListener.php → app/Listeners/SourceHeartbeatListener.php
View File

@ -4,7 +4,7 @@ namespace App\Listeners;
use App\Events\ExampleEvent;
use App\Events\SourceHeartbeatEvent;
use App\Providers\SourceHealthServiceProvider;
use App\Providers\SourceHeartbeatProvider;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Storage;
@ -12,7 +12,7 @@ use League\Flysystem\FileNotFoundException;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
class SourceHealthListener
class SourceHeartbeatListener
{
private $logger;
@ -27,7 +27,7 @@ class SourceHealthListener
$this->logger = new Logger('source-health-monitor');
$this->logger->pushHandler(new StreamHandler(storage_path().'/logs/source-health-monitor.log'), env('APP_DEBUG') ? Logger::DEBUG : Logger::WARNING);
if (SourceHealthServiceProvider::isFailoverEnabled()) {
if (SourceHeartbeatProvider::isFailoverEnabled()) {
$lastFailoverLockTimestamp = $this->getLastFailoverLockTimestamp();
$this->logger->debug('Failover is RUNNING');

4
app/Providers/SourceHealthServiceProvider.php → app/Providers/SourceHeartbeatProvider.php
View File

@ -5,7 +5,7 @@ namespace App\Providers;
use Illuminate\Support\Facades\Storage;
use Laravel\Lumen\Providers\EventServiceProvider as ServiceProvider;
class SourceHealthServiceProvider extends ServiceProvider
class SourceHeartbeatProvider extends ServiceProvider
{
const BAD_HEALTH_STATUSES = [403, 500, 501, 502, 503, 504, 505];
@ -17,7 +17,7 @@ class SourceHealthServiceProvider extends ServiceProvider
*/
protected $listen = [
'App\Events\SourceHeartbeatEvent' => [
'App\Listeners\SourceHealthListener',
'App\Listeners\SourceHeartbeatListener',
],
];

4
bootstrap/app.php
View File

@ -121,9 +121,7 @@ $app->instance('JikanParser', $jikan);
$app->instance('SerializerV4', SerializerFactory::createV4());
if (env('SOURCE_BAD_HEALTH_FAILOVER') && env('DB_CACHING')) {
$app->register(\App\Providers\SourceHealthServiceProvider::class);
}
$app->register(\App\Providers\SourceHeartbeatProvider::class);
/**