wait #6199 @1

diff --git a/.docker/config/supervisor/default-worker.conf b/.docker/config/supervisor/default-worker.conf
index 3b4558676342a982f00152027330b8568f8629e6..6d4340071c8732cd0a16550c488ee5b1158c9966 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=php /application/artisan queue:work --queue=default --timeout=0
+command=/usr/bin/php /application/artisan queue:work --queue=default --timeout=0 --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 0365624f36099f15c07acafb22ed6eabebfff7c4..e9d37c01b537c077ccc1e14db505324830c079a4 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
+command=php /application/artisan queue:work --queue=download --timeout=0 --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 ca0029e7c3a4d3b778cce2a7242b72104c70dd89..7e8c47071c5386f40cd6640bb8f1690961ca0394 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
+command=php /application/artisan queue:work --queue=fluidbookprocess --timeout=0 --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 87eba7db7ddf976772a0f27d9cb3ed315c9efca9..cba0eb7618aad115be9b676103d0bceba51993dd 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
+command=php /application/artisan queue:work --queue=theme --timeout=0 --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 4b238f8d476b58f22d7937ba849cdc46f2705ad0..98c66e4607b80ad6fb93076f5e09d186fa8735bc 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
+command=php /application/artisan queue:work --queue=ws2 --timeout=0 --max-time=3600 --memory=12000
 autostart=true
 autorestart=true
 user=toolbox

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 26d5453083d1980e47467e0b9aa25cee5fdc826b..13bc9d28f14e3e3371a8307f5808f79c1e36dce9 100644 (file)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -40,7 +40,7 @@ class Kernel extends \Cubist\Backpack\Console\Kernel
             $schedule->command('fluidbook:quote --reminder')->weekdays()->at('10:00');
         }
 
-        $schedule->command('job:dispatch ProcessTotals')->everyTwoHours();
+        $schedule->command('job:dispatchNow ProcessTotals')->everyTwoHours();
         $schedule->command('fluidbook:player:updatesources')->everyTwoHours();
         $schedule->command('job:dispatchNow \\\\Cubedesigners\\\\UserDatabase\\\\Jobs\\\\ApplyPermissionsToUsers')->everyTwoHours();
 

diff --git a/config/queue.php b/config/queue.php
index 3a30d6c68c5c0758143f246e71610b1ebafd7463..5a0356205aa806c96c47506e0c4764b112fef993 100644 (file)
--- a/config/queue.php
+++ b/config/queue.php
@@ -38,6 +38,7 @@ return [
             'driver' => 'database',
             'table' => 'jobs',
             'queue' => 'default',
+            'after_commit' => true,
             'retry_after' => 90,
         ],