wait #7476 @0.5

diff --git a/.docker/config/supervisor/conf.d/download-worker.conf b/.docker/config/supervisor/conf.d/download-worker.conf
index a24758a3df35b85bdad37f0b6a6a3de25b3abad1..997e1af93c7ca8f0d9f40b0ae7d809658c58a11b 100644 (file)
--- a/.docker/config/supervisor/conf.d/download-worker.conf
+++ b/.docker/config/supervisor/conf.d/download-worker.conf
@@ -5,6 +5,6 @@ autostart=true
 autorestart=true
 user=toolbox
 group=www-data
-numprocs=2
+numprocs=6
 redirect_stderr=true
 stdout_logfile=/proc/self/fd/2

diff --git a/app/Jobs/FluidbookCollectionDownload.php b/app/Jobs/FluidbookCollectionDownload.php
index 2a5a5749279f8f56386a654dc7ecf87878f435fd..dd93a38cb675cb90ff3b243822624546ea7c435b 100644 (file)
--- a/app/Jobs/FluidbookCollectionDownload.php
+++ b/app/Jobs/FluidbookCollectionDownload.php
@@ -202,7 +202,7 @@ class FluidbookCollectionDownload extends DownloadBase
 
             $jobs[] = $this->_jobDownloadFluidbook($fbid, $version, $basePath . $this->dirs[$fbid], $fbOptions, true);
         }
-        $this->_waitJobs($jobs);
+        //$this->_waitJobs($jobs);
 
         if (in_array('en', $this->langs)) {
             $default = 'en';
@@ -363,7 +363,7 @@ class FluidbookCollectionDownload extends DownloadBase
         $job->setJobName('export_' . $id);
         $job->setDestination($dest);
         if ($async) {
-            dispatch($job)->onQueue('ws2');
+            dispatch($job)->onQueue('download');
         } else {
             $job->handle();
         }