From 048ca07f4b81dda8764d473ff5313ff51108fa84 Mon Sep 17 00:00:00 2001
From: awkawb <bryant.gitea@fastmail.com>
Date: Fri, 11 Oct 2024 14:41:42 -0400
Subject: [PATCH] Work on Laravel queue

---
 invoice-ninja.nix | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/invoice-ninja.nix b/invoice-ninja.nix
index 8f7b0c3..bfa19c7 100644
--- a/invoice-ninja.nix
+++ b/invoice-ninja.nix
@@ -88,12 +88,6 @@ in
       '';
     };
 
-    queueWorkerInterval = lib.mkOption {
-      type = lib.types.str;
-      default = "5m";
-      description = "How often the Invoice Ninja worker task should run.";
-    };
-
     hostName = lib.mkOption {
       type = lib.types.str;
       default = "localhost";
@@ -376,23 +370,16 @@ in
     # Ensure chromium is available
     systemd.services.phpfpm-invoice-ninja.path = extraPrograms;
 
-    systemd.timers.invoice-ninja-worker = {
-      description = "Invoice Ninja periodic tasks timer";
-      after = [ "invoice-ninja-data-setup.service" ];
-      requires = [ "phpfpm-invoice-ninja.service" ];
-      wantedBy = [ "timers.target" ];
-
-      timerConfig = {
-        OnBootSec = cfg.schedulerInterval;
-        OnUnitActiveSec = cfg.schedulerInterval;
-      };
-    };
-
     systemd.services.invoice-ninja-worker = {
       description = "Invoice Ninja periodic tasks";
+      after = [ "invoice-ninja-data-setup.service" ];
+      requires = [ "phpfpm-invoice-ninja.service" ];
+      wantedBy = [ "multi-user.target" ];
+      reloadTriggers = [ invoice-ninja ];
+      reload = "${invoice-ninja-manage}/bin/invoice-ninja-manage queue:restart";
 
       serviceConfig = {
-        ExecStart = "${invoice-ninja-manage}/bin/invoice-ninja-manage queue:work --stop-when-empty";
+        ExecStart = "${invoice-ninja-manage}/bin/invoice-ninja-manage queue:work";
         User = user;
         Group = group;
         StateDirectory = lib.mkIf (cfg.dataDir == "/var/lib/invoice-ninja") "invoice-ninja";