fix #6199 @0:10

diff --git a/.docker/config/supervisor/default-worker.conf b/.docker/config/supervisor/default-worker.conf
index 6d4340071c8732cd0a16550c488ee5b1158c9966..53f6301ed8673b1e4071889349643aa1ec833f64 100644 (file)
--- 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 e9d37c01b537c077ccc1e14db505324830c079a4..0fea922e62c31eb0f340e8431b636b208fb5940e 100644 (file)
--- 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 7e8c47071c5386f40cd6640bb8f1690961ca0394..ff79eb15bf40ddf5bf7f769c02619e4f8fa2628f 100644 (file)
--- 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 cba0eb7618aad115be9b676103d0bceba51993dd..80de115225b7251e62c9826151babf12d9f8e773 100644 (file)
--- 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 98c66e4607b80ad6fb93076f5e09d186fa8735bc..1a70dcd429f8ae8325f537ba1dd5eee1bf9a5d87 100644 (file)
--- 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 cc2d066a6c36586ece87e6f12e8fb7df9d6b46fc..d26f0f7c517e04d35ff6d250cadf87cc0fbd3270 100644 (file)
--- 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;