From 3beb7594da7f83f6f85d52d3179f0deed1307287 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 23 Aug 2023 13:06:45 +0200
Subject: [PATCH] wait #6199 @1

---
 .docker/config/supervisor/default-worker.conf           | 2 +-
 .docker/config/supervisor/download-worker.conf          | 2 +-
 .docker/config/supervisor/fluidbook-process-worker.conf | 2 +-
 .docker/config/supervisor/theme-worker.conf             | 2 +-
 .docker/config/supervisor/ws2-worker.conf               | 2 +-
 app/Console/Kernel.php                                  | 2 +-
 config/queue.php                                        | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.docker/config/supervisor/default-worker.conf b/.docker/config/supervisor/default-worker.conf
index 3b4558676..6d4340071 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=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 0365624f3..e9d37c01b 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
+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 ca0029e7c..7e8c47071 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
+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 87eba7db7..cba0eb761 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
+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 4b238f8d4..98c66e460 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
+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 26d545308..13bc9d28f 100644
--- 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 3a30d6c68..5a0356205 100644
--- 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,
         ],
 
-- 
2.39.5