From: Vladimir Fomichev Date: Fri, 17 Oct 2025 12:10:33 +0000 (+0300) Subject: Добавляем ttr переводим на RetryableJobInterface X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=31004b5de17ae65c0d6a367805953c8249678478;p=erp24_rep%2Fyii-erp24%2F.git Добавляем ttr переводим на RetryableJobInterface --- diff --git a/erp24/api2/config/api2.config.php b/erp24/api2/config/api2.config.php index ddc74d7b..d284053a 100644 --- a/erp24/api2/config/api2.config.php +++ b/erp24/api2/config/api2.config.php @@ -67,7 +67,7 @@ return [ 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . (getenv('RABBIT_HOST') ?: 'localhost') . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, - 'ttr' => 300, // Время для выполнения задания + 'ttr' => 600, // Время для выполнения задания 'attempts' => 3, // Количество попыток 'exchangeName' => 'telegram-exchange', ], diff --git a/erp24/config/console.php b/erp24/config/console.php index 22b02f94..5b0fcb51 100755 --- a/erp24/config/console.php +++ b/erp24/config/console.php @@ -46,12 +46,9 @@ $config = [ 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . $params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, - 'ttr' => 300, // Время для выполнения задания + 'ttr' => 600, // Время для выполнения задания 'attempts' => 3, // Количество попыток 'exchangeName' => 'telegram-exchange', - - - ], 'cache' => [ 'class' => 'yii\caching\FileCache', diff --git a/erp24/config/web.php b/erp24/config/web.php index 37c327a7..e58b6228 100644 --- a/erp24/config/web.php +++ b/erp24/config/web.php @@ -46,17 +46,17 @@ $config = [ 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . $params['RABBIT_HOST'] . ':5672', 'queueName' => 'telegram-queue', 'as log' => \yii\queue\LogBehavior::class, - 'ttr' => 300, // Время для выполнения задания + 'ttr' => 600, // Время для выполнения задания 'attempts' => 3, // Количество попыток 'exchangeName' => 'telegram-exchange', ], - 'puppeteer' => [ - 'class' => \yii_app\services\FlowwowService::class, - 'endpoint' => 'http://node-yii_erp24:3030', - ], +// 'puppeteer' => [ +// 'class' => \yii_app\services\FlowwowService::class, +// 'endpoint' => 'http://node-yii_erp24:3030', +// ], 'cache' => [ 'class' => 'yii\caching\FileCache', ], diff --git a/erp24/jobs/SendRequestUploadDataToJob.php b/erp24/jobs/SendRequestUploadDataToJob.php index 9cbf0121..b7409860 100644 --- a/erp24/jobs/SendRequestUploadDataToJob.php +++ b/erp24/jobs/SendRequestUploadDataToJob.php @@ -7,10 +7,10 @@ namespace yii_app\jobs; -use yii\queue\JobInterface; +use yii\queue\RetryableJobInterface; use yii_app\services\UploadService; -class SendRequestUploadDataToJob extends \yii\base\BaseObject implements JobInterface +class SendRequestUploadDataToJob implements RetryableJobInterface { public $decodingResult; public function execute($queue) { @@ -20,7 +20,12 @@ class SendRequestUploadDataToJob extends \yii\base\BaseObject implements JobInte } + public function getTtr() { + return 600; + } - + public function canRetry($attempt, $error) { + return $attempt < 3; + } }