From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 24 Aug 2023 10:40:43 +0000 (+0200)
Subject: fix #6199 @0:10
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2850048240820cfb3a0991f76c776094259b1980;p=fluidbook-toolbox.git

fix #6199 @0:10
---

diff --git a/.docker/config/supervisor/default-worker.conf b/.docker/config/supervisor/default-worker.conf
index 6d4340071..53f6301ed 100644
--- a/.docker/config/supervisor/default-worker.conf
+++ b/.docker/config/supervisor/default-worker.conf
@@ -1,6 +1,6 @@
 [program:default-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=/usr/bin/php /application/artisan queue:work --queue=default --timeout=0 --max-time=3600 --memory=12000
+command=php /application/artisan queue:work --queue=default --timeout=120 --max-time=3600 --memory=12000
 autostart=true
 autorestart=true
 user=toolbox
diff --git a/.docker/config/supervisor/download-worker.conf b/.docker/config/supervisor/download-worker.conf
index e9d37c01b..0fea922e6 100644
--- a/.docker/config/supervisor/download-worker.conf
+++ b/.docker/config/supervisor/download-worker.conf
@@ -1,6 +1,6 @@
 [program:download-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /application/artisan queue:work --queue=download --timeout=0 --max-time=3600 --memory=12000
+command=php /application/artisan queue:work --queue=download --timeout=7200 --max-time=3600 --memory=12000
 autostart=true
 autorestart=true
 user=toolbox
diff --git a/.docker/config/supervisor/fluidbook-process-worker.conf b/.docker/config/supervisor/fluidbook-process-worker.conf
index 7e8c47071..ff79eb15b 100644
--- a/.docker/config/supervisor/fluidbook-process-worker.conf
+++ b/.docker/config/supervisor/fluidbook-process-worker.conf
@@ -1,6 +1,6 @@
 [program:process-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /application/artisan queue:work --queue=fluidbookprocess --timeout=0 --max-time=3600 --memory=12000
+command=php /application/artisan queue:work --queue=fluidbookprocess --timeout=7200 --max-time=3600 --memory=12000
 autostart=true
 autorestart=true
 user=toolbox
diff --git a/.docker/config/supervisor/theme-worker.conf b/.docker/config/supervisor/theme-worker.conf
index cba0eb761..80de11522 100644
--- a/.docker/config/supervisor/theme-worker.conf
+++ b/.docker/config/supervisor/theme-worker.conf
@@ -1,6 +1,6 @@
 [program:theme-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /application/artisan queue:work --queue=theme --timeout=0 --max-time=3600 --memory=12000
+command=php /application/artisan queue:work --queue=theme --timeout=360 --max-time=3600 --memory=12000
 autostart=true
 autorestart=true
 user=toolbox
diff --git a/.docker/config/supervisor/ws2-worker.conf b/.docker/config/supervisor/ws2-worker.conf
index 98c66e460..1a70dcd42 100644
--- a/.docker/config/supervisor/ws2-worker.conf
+++ b/.docker/config/supervisor/ws2-worker.conf
@@ -1,6 +1,6 @@
 [program:default-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /application/artisan queue:work --queue=ws2 --timeout=0 --max-time=3600 --memory=12000
+command=php /application/artisan queue:work --queue=ws2 --timeout=360 --max-time=3600 --memory=12000
 autostart=true
 autorestart=true
 user=toolbox
diff --git a/app/Jobs/FluidbookImagesPreprocess.php b/app/Jobs/FluidbookImagesPreprocess.php
index cc2d066a6..d26f0f7c5 100644
--- a/app/Jobs/FluidbookImagesPreprocess.php
+++ b/app/Jobs/FluidbookImagesPreprocess.php
@@ -28,6 +28,7 @@ class FluidbookImagesPreprocess extends Base
 
     public function __construct($book_id, $sync = false, $hangMaxTime = 10)
     {
+        $this->onQueue('fluidbookprocess');
         $this->book_id = $book_id;
         $this->_sync = $sync;
         $this->_hangMaxTime = $hangMaxTime;