Правки и чистка

diff --git a/docker/supervisor/Dockerfile b/docker/supervisor/Dockerfile
index c9a1eca131087490f701cbe404db3e14fbc1f881..293de9983f54f25895d3d1a3487f2aabba6f53ce 100644 (file)
--- a/docker/supervisor/Dockerfile
+++ b/docker/supervisor/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /var/log/supervisor
 
 # Добавление PostgreSQL драйверов
 RUN apk add --no-cache postgresql-dev \
-    && docker-php-ext-install pdo_pgsql calendar
+    && docker-php-ext-install pdo_pgsql
 # Копирование конфигурации
 COPY ./conf/supervisord.conf /etc/supervisor/supervisord.conf
 COPY ./conf/queue-worker.conf /etc/supervisor/conf.d/queue-worker.conf

diff --git a/docker/supervisor/conf/queue-worker.conf b/docker/supervisor/conf/queue-worker.conf
index 49a8ef4e68f92ad906e25425b93fe91fbfe8ff72..beea37157fe5d7f1e9ea38dde15aea0a3e56d6d7 100644 (file)
--- a/docker/supervisor/conf/queue-worker.conf
+++ b/docker/supervisor/conf/queue-worker.conf
@@ -1,5 +1,5 @@
 [program:yii-queue]
-command=/usr/local/bin/php -d memory_limit=512M /www/yii queue/listen amqp --verbose=1 --color=0
+command=/usr/local/bin/php /www/yii queue/listen --verbose
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/yii-queue.err.log

diff --git a/erp24/config/console.php b/erp24/config/console.php
index bb3821bab679738857c43f1dfc53bd2114974fcf..abb400af9214b1a1bdad5872fb33188f7894a76d 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@rabbitmq-yii_erp24:5672',
+           // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
             'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,

diff --git a/erp24/config/web.php b/erp24/config/web.php
index 773e430da8aee70bda19f7d4f44720b77162175a..874a787cffbab6fa48529b26386c64cf4b859def 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@rabbitmq-yii_erp24:5672',
+            // 'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
             'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
             'queueName' => 'telegram-queue',
             'as log' => \yii\queue\LogBehavior::class,