Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f504c50c9b |
@@ -1,48 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Базовый класс для описания команд по расписанию
|
|
||||||
* Создан, в частности, чтобы предоставить универсальный функционал для всех команд, запускаемых по расписанию
|
|
||||||
*/
|
|
||||||
abstract class BaseScheduleCommand extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Метод выполнения команды
|
|
||||||
*
|
|
||||||
* @param callable $execFunc функция с логикой выполнения команды
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
protected function executeCommand(callable $execFunc): void
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
$execFunc();
|
|
||||||
|
|
||||||
} catch (\Throwable $th) {
|
|
||||||
$this->logExecErr($th);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Метод логирования ошибки выполнения скриптов по расписанию
|
|
||||||
*
|
|
||||||
* @param \Throwable $th
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
private function logExecErr(\Throwable $th): void
|
|
||||||
{
|
|
||||||
$context = [
|
|
||||||
//Скрипт откуда запустилась задача
|
|
||||||
'command' => static::class,
|
|
||||||
//Скрипт, в котором произошла ошибка
|
|
||||||
'file' => $th->getFile(),
|
|
||||||
'line' => $th->getLine(),
|
|
||||||
];
|
|
||||||
\Log::channel('schedule_err')->error($th->getMessage(), $context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Dto;
|
||||||
|
|
||||||
|
class ApiResponseDto
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public readonly ?string $message = null,
|
||||||
|
// public readonly ?int $statusCode = 200,
|
||||||
|
public readonly mixed $data = null,
|
||||||
|
public readonly mixed $meta = null,
|
||||||
|
)
|
||||||
|
{
|
||||||
|
// return new self($this->message, $this->statusCode, $this->data, $this->meta);
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static function success()
|
||||||
|
// {
|
||||||
|
// return new self($message, $data, $statusCode = 200);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// public static function error()
|
||||||
|
// {
|
||||||
|
// return new self($message, $data, $statusCode = 400);
|
||||||
|
// }
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Facades;
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Facade;
|
|
||||||
use App\Services\RedisNotificationService;
|
|
||||||
|
|
||||||
class RedisNotifications extends Facade
|
|
||||||
{
|
|
||||||
protected static function getFacadeAccessor()
|
|
||||||
{
|
|
||||||
return \App\Services\RedisNotificationService::class;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Job;
|
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Базовый класс для выполнения джобы
|
|
||||||
*/
|
|
||||||
class BaseJob implements ShouldQueue
|
|
||||||
{
|
|
||||||
|
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Метод обработки ошибки при выполнении джобы
|
|
||||||
*
|
|
||||||
* @param \Throwable $th
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function failed(\Throwable $th): void
|
|
||||||
{
|
|
||||||
$context = [
|
|
||||||
//Скрипт откуда запустилась задача
|
|
||||||
'command' => static::class,
|
|
||||||
//Скрипт, в котором произошла ошибка
|
|
||||||
'file' => $th->getFile(),
|
|
||||||
'line' => $th->getLine(),
|
|
||||||
];
|
|
||||||
\Log::channel('job_err')->error($th->getMessage(), $context);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Providers;
|
||||||
|
|
||||||
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
use App\Services\ApiResponder;
|
||||||
|
|
||||||
|
class ApiResponderProvider extends ServiceProvider
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Register services.
|
||||||
|
*/
|
||||||
|
public function register(): void
|
||||||
|
{
|
||||||
|
$this->app->bind(ApiResponder::class, function($app){
|
||||||
|
return new ApiResponder();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bootstrap services.
|
||||||
|
*/
|
||||||
|
public function boot(): void
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Providers;
|
|
||||||
|
|
||||||
use App\Services\RedisNotificationService;
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Провайдер для работы с сервисом Redis для хранения нотификаций для отображения на фронте
|
|
||||||
*/
|
|
||||||
class RedisNotificationProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Register services.
|
|
||||||
*/
|
|
||||||
public function register(): void
|
|
||||||
{
|
|
||||||
$this->app->bind(RedisNotificationService::class, function($app){
|
|
||||||
return new RedisNotificationService;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Bootstrap services.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Services;
|
||||||
|
|
||||||
|
use App\Dto\ApiResponseDto;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
|
||||||
|
class ApiResponder{
|
||||||
|
public $dto;
|
||||||
|
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
)
|
||||||
|
{}
|
||||||
|
|
||||||
|
public function success(): JsonResponse
|
||||||
|
{
|
||||||
|
return $this->buildResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function error()
|
||||||
|
{
|
||||||
|
return $this->buildResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setDto(ApiResponseDto $dto)
|
||||||
|
{
|
||||||
|
$this->dto = $dto;
|
||||||
|
}
|
||||||
|
|
||||||
|
// public function fromDTO(ApiResponseDto $dto)
|
||||||
|
// {
|
||||||
|
// return $dto;
|
||||||
|
// }
|
||||||
|
|
||||||
|
#Гаврилов
|
||||||
|
//СБОР СТАТИСТИКИ ПО ВЫЗЫВАЕМЫМ API ЕНДПОИНТАМ. ВНЕСТИ В TODO ПРОЕКТА
|
||||||
|
private function setStatistics()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#Гаврилов
|
||||||
|
//ДОБАВЬ ЛОГИРОВАНИЕ ОШИБОК В TRY CATCH В .LOG ФАЙЛ
|
||||||
|
|
||||||
|
private function buildResponse(): JsonResponse
|
||||||
|
{
|
||||||
|
//echo '<pre>'; var_dump((array)$this->dto); echo'</pre>';
|
||||||
|
//return (array) $this->dto;
|
||||||
|
return response()->json((array) $this->dto);
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -74,8 +74,8 @@ return [
|
|||||||
|
|
||||||
'redis' => [
|
'redis' => [
|
||||||
'driver' => 'redis',
|
'driver' => 'redis',
|
||||||
'connection' => 'cache',
|
'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
|
||||||
'lock_connection' => 'default',
|
'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
|
||||||
],
|
],
|
||||||
|
|
||||||
'dynamodb' => [
|
'dynamodb' => [
|
||||||
|
|||||||
+12
-22
@@ -138,7 +138,7 @@ return [
|
|||||||
|
|
|
|
||||||
| Redis is an open source, fast, and advanced key-value store that also
|
| Redis is an open source, fast, and advanced key-value store that also
|
||||||
| provides a richer body of commands than a typical key-value system
|
| provides a richer body of commands than a typical key-value system
|
||||||
| such as APC or Memcached. Laravel makes it easy to dig right in.
|
| such as Memcached. You may define your connection settings here.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -148,9 +148,8 @@ return [
|
|||||||
|
|
||||||
'options' => [
|
'options' => [
|
||||||
'cluster' => env('REDIS_CLUSTER', 'redis'),
|
'cluster' => env('REDIS_CLUSTER', 'redis'),
|
||||||
//'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
|
'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-database-'),
|
||||||
//Нижний прочерк нужен, чтобы отделить платформу_модуль от сущность:id:значение. Если после нижнего прочерка ничего нет, значение было установлено из "корня" платформы
|
'persistent' => env('REDIS_PERSISTENT', false),
|
||||||
'prefix' => env('REDIS_PREFIX', 'uknown|'),
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'default' => [
|
'default' => [
|
||||||
@@ -160,6 +159,10 @@ return [
|
|||||||
'password' => env('REDIS_PASSWORD'),
|
'password' => env('REDIS_PASSWORD'),
|
||||||
'port' => env('REDIS_PORT', '6379'),
|
'port' => env('REDIS_PORT', '6379'),
|
||||||
'database' => env('REDIS_DB', '0'),
|
'database' => env('REDIS_DB', '0'),
|
||||||
|
'max_retries' => env('REDIS_MAX_RETRIES', 3),
|
||||||
|
'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
|
||||||
|
'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
|
||||||
|
'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
|
||||||
],
|
],
|
||||||
|
|
||||||
'cache' => [
|
'cache' => [
|
||||||
@@ -168,26 +171,13 @@ return [
|
|||||||
'username' => env('REDIS_USERNAME'),
|
'username' => env('REDIS_USERNAME'),
|
||||||
'password' => env('REDIS_PASSWORD'),
|
'password' => env('REDIS_PASSWORD'),
|
||||||
'port' => env('REDIS_PORT', '6379'),
|
'port' => env('REDIS_PORT', '6379'),
|
||||||
'database' => '1',
|
'database' => env('REDIS_CACHE_DB', '1'),
|
||||||
|
'max_retries' => env('REDIS_MAX_RETRIES', 3),
|
||||||
|
'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'),
|
||||||
|
'backoff_base' => env('REDIS_BACKOFF_BASE', 100),
|
||||||
|
'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000),
|
||||||
],
|
],
|
||||||
|
|
||||||
'queue' => [
|
|
||||||
'url' => env('REDIS_URL'),
|
|
||||||
'host' => env('REDIS_HOST', '127.0.0.1'),
|
|
||||||
'username' => env('REDIS_USERNAME'),
|
|
||||||
'password' => env('REDIS_PASSWORD'),
|
|
||||||
'port' => env('REDIS_PORT', '6379'),
|
|
||||||
'database' => '2',
|
|
||||||
],
|
|
||||||
|
|
||||||
'notifications' => [
|
|
||||||
'url' => env('REDIS_URL'),
|
|
||||||
'host' => env('REDIS_HOST', '127.0.0.1'),
|
|
||||||
'username' => env('REDIS_USERNAME'),
|
|
||||||
'password' => env('REDIS_PASSWORD'),
|
|
||||||
'port' => env('REDIS_PORT', '6379'),
|
|
||||||
'database' => '3',
|
|
||||||
],
|
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
+40
-22
@@ -7,24 +7,25 @@ return [
|
|||||||
| Default Queue Connection Name
|
| Default Queue Connection Name
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Laravel's queue API supports an assortment of back-ends via a single
|
| Laravel's queue supports a variety of backends via a single, unified
|
||||||
| API, giving you convenient access to each back-end using the same
|
| API, giving you convenient access to each backend using identical
|
||||||
| syntax for every one. Here you may define a default connection.
|
| syntax for each. The default queue connection is defined below.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('QUEUE_CONNECTION', 'sync'),
|
'default' => env('QUEUE_CONNECTION', 'database'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Queue Connections
|
| Queue Connections
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here you may configure the connection information for each server that
|
| Here you may configure the connection options for every queue backend
|
||||||
| is used by your application. A default configuration has been added
|
| used by your application. An example configuration is provided for
|
||||||
| for each back-end shipped with Laravel. You are free to add more.
|
| each backend supported by Laravel. You're also free to add more.
|
||||||
|
|
|
|
||||||
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis",
|
||||||
|
| "deferred", "background", "failover", "null"
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -36,17 +37,18 @@ return [
|
|||||||
|
|
||||||
'database' => [
|
'database' => [
|
||||||
'driver' => 'database',
|
'driver' => 'database',
|
||||||
'table' => 'jobs',
|
'connection' => env('DB_QUEUE_CONNECTION'),
|
||||||
'queue' => 'default',
|
'table' => env('DB_QUEUE_TABLE', 'jobs'),
|
||||||
'retry_after' => 90,
|
'queue' => env('DB_QUEUE', 'default'),
|
||||||
|
'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
|
||||||
'after_commit' => false,
|
'after_commit' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
'beanstalkd' => [
|
'beanstalkd' => [
|
||||||
'driver' => 'beanstalkd',
|
'driver' => 'beanstalkd',
|
||||||
'host' => 'localhost',
|
'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
|
||||||
'queue' => 'default',
|
'queue' => env('BEANSTALKD_QUEUE', 'default'),
|
||||||
'retry_after' => 90,
|
'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
|
||||||
'block_for' => 0,
|
'block_for' => 0,
|
||||||
'after_commit' => false,
|
'after_commit' => false,
|
||||||
],
|
],
|
||||||
@@ -62,17 +64,31 @@ return [
|
|||||||
'after_commit' => false,
|
'after_commit' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
#Гаврилов
|
|
||||||
//ЗАЧЕМ ЭТОТ КОНФИГ? В .ENV НЕТ ПАРАМЕТРА REDIS_QUEUE
|
|
||||||
'redis' => [
|
'redis' => [
|
||||||
'driver' => 'redis',
|
'driver' => 'redis',
|
||||||
'connection' => 'default',
|
'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
|
||||||
'queue' => env('REDIS_QUEUE', 'default'),
|
'queue' => env('REDIS_QUEUE', 'default'),
|
||||||
'retry_after' => 90,
|
'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
|
||||||
'block_for' => null,
|
'block_for' => null,
|
||||||
'after_commit' => false,
|
'after_commit' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'deferred' => [
|
||||||
|
'driver' => 'deferred',
|
||||||
|
],
|
||||||
|
|
||||||
|
'background' => [
|
||||||
|
'driver' => 'background',
|
||||||
|
],
|
||||||
|
|
||||||
|
'failover' => [
|
||||||
|
'driver' => 'failover',
|
||||||
|
'connections' => [
|
||||||
|
'database',
|
||||||
|
'deferred',
|
||||||
|
],
|
||||||
|
],
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -87,7 +103,7 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'batching' => [
|
'batching' => [
|
||||||
'database' => env('DB_CONNECTION', 'mysql'),
|
'database' => env('DB_CONNECTION', 'sqlite'),
|
||||||
'table' => 'job_batches',
|
'table' => 'job_batches',
|
||||||
],
|
],
|
||||||
|
|
||||||
@@ -97,14 +113,16 @@ return [
|
|||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| These options configure the behavior of failed queue job logging so you
|
| These options configure the behavior of failed queue job logging so you
|
||||||
| can control which database and table are used to store the jobs that
|
| can control how and where failed jobs are stored. Laravel ships with
|
||||||
| have failed. You may change them to any database / table you wish.
|
| support for storing failed jobs in a simple file or in a database.
|
||||||
|
|
|
||||||
|
| Supported drivers: "database-uuids", "dynamodb", "file", "null"
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'failed' => [
|
'failed' => [
|
||||||
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
|
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
|
||||||
'database' => env('DB_CONNECTION', 'mysql'),
|
'database' => env('DB_CONNECTION', 'sqlite'),
|
||||||
'table' => 'failed_jobs',
|
'table' => 'failed_jobs',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user