添加 错误处理和运行时间检测
This commit is contained in:
parent
6ae115c99c
commit
9a32106246
@ -4,13 +4,15 @@
|
|||||||
|
|
||||||
use App\Models\Module\Module;
|
use App\Models\Module\Module;
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use Illuminate\Support\Facades\Cache;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
|
use GuzzleHttp\Exception\ConnectException;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
use Illuminate\Foundation\Bus\Dispatchable;
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
use Illuminate\Support\Facades\Cache;
|
|
||||||
use Illuminate\Support\Facades\Http;
|
|
||||||
|
|
||||||
class FetchModule implements ShouldQueue
|
class FetchModule implements ShouldQueue
|
||||||
{
|
{
|
||||||
@ -33,14 +35,30 @@ public function __construct()
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
|
// 获取运行完成的时间
|
||||||
|
|
||||||
|
$last_run = Cache::get('servers_updated_at', false);
|
||||||
|
if ($last_run !== false) {
|
||||||
|
// 如果和上次运行时间间隔小于一分钟,则不运行
|
||||||
|
if (now()->diffInMinutes($last_run) < 1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
Module::whereNotNull('url')->chunk(100, function ($modules) {
|
Module::whereNotNull('url')->chunk(100, function ($modules) {
|
||||||
$servers = [];
|
$servers = [];
|
||||||
|
|
||||||
foreach ($modules as $module) {
|
foreach ($modules as $module) {
|
||||||
|
try {
|
||||||
$http = Http::remote($module->api_token, $module->url);
|
$http = Http::remote($module->api_token, $module->url);
|
||||||
// dd($module->url);
|
// dd($module->url);
|
||||||
$response = $http->get('remote');
|
$response = $http->get('remote');
|
||||||
|
} catch (ConnectException $e) {
|
||||||
|
Log::error($e->getMessage());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($response->successful()) {
|
if ($response->successful()) {
|
||||||
$json = $response->json();
|
$json = $response->json();
|
||||||
@ -70,6 +88,9 @@ public function handle()
|
|||||||
} else {
|
} else {
|
||||||
Cache::put('servers', $servers, now()->addMinutes(10));
|
Cache::put('servers', $servers, now()->addMinutes(10));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 缓存运行完成的时间
|
||||||
|
Cache::put('servers_updated_at', now(), now()->addMinutes(10));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user