исправление доступа к параметрам

diff --git a/erp24/api2/config/api2.config.php b/erp24/api2/config/api2.config.php
index 6733839b21117c15a815d07843cac1470447b48f..ddc74d7b08c93e70dc779afa69a4193efd0ab3f1 100644 (file)
--- a/erp24/api2/config/api2.config.php
+++ b/erp24/api2/config/api2.config.php
@@ -64,7 +64,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . (getenv('RABBIT_HOST') ?: 'localhost') . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/console.php b/erp24/config/console.php
index 41cd21a313f3534af6dd2966e8f21477412731f2..4e1d12ef5e26b5cbbc4ad02027eef755fb5b013e 100755 (executable)
--- a/erp24/config/console.php
+++ b/erp24/config/console.php
@@ -42,7 +42,7 @@ $config = [
 //        ],
         'queue' => [
             'class' => Queue::class,
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . $params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/prod.console.config.php b/erp24/config/prod.console.config.php
index 9b65a3502386496025f7faf9e6f1483c587c8fb4..bde767669787d4cb9e2f47cb65092294469ca87f 100755 (executable)
--- a/erp24/config/prod.console.config.php
+++ b/erp24/config/prod.console.config.php
@@ -1,7 +1,7 @@
 <?php
 
 use yii\queue\amqp_interop\Queue;
-
+$params = require __DIR__ . '/params.php';
 global $_CONFIG_SITE;
 return [
     'language' => 'ru',
@@ -62,7 +62,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . $params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/config/web.php b/erp24/config/web.php
index 86d50abd958305a81d9ec57d9731c95b8c3c7ca3..5381261e039dfb18796a657aebaf5582ab05cc39 100644 (file)
--- a/erp24/config/web.php
+++ b/erp24/config/web.php
@@ -42,7 +42,7 @@ $config = [
         ],
         'queue' => [
             'class' => Queue::class,
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . $params['RABBIT_HOST'] . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания

diff --git a/erp24/media/config/media.config.php b/erp24/media/config/media.config.php
index bf13a7248e9fdb8e8002332e386ab43116faf2a6..e118c04bcb2c482b0e750b06902482be2bc490c2 100644 (file)
--- a/erp24/media/config/media.config.php
+++ b/erp24/media/config/media.config.php
@@ -25,7 +25,7 @@ return [
         ],
         'queue' => [
             'class' => Queue::class,
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . Yii::$app->params['RABBIT_HOST'] . ':5672',
+            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@' . (getenv('RABBIT_HOST') ?: 'localhost') . ':5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,
             'ttr' => 300, // Время для выполнения задания