From bab7179c366a07b626df3de386d39a67e6252d9c Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Thu, 20 Apr 2023 17:20:32 +0000
Subject: [PATCH] Switch back to custom mastodon.nix queue definitions

---
 disable-services.nix |  2 +-
 mastodon.nix         | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/disable-services.nix b/disable-services.nix
index 7ff0c73..1ec45d7 100644
--- a/disable-services.nix
+++ b/disable-services.nix
@@ -5,7 +5,7 @@
   systemd.services."mastodon-init-dirs".wantedBy = lib.mkForce [ ];
   systemd.services."mastodon-media-auto-remove".startAt = lib.mkForce [ ];
   systemd.services."mastodon-media-auto-remove".wantedBy = lib.mkForce [ ];
-  systemd.services."mastodon-sidekiq-all".wantedBy = lib.mkForce [ ];
+  systemd.services."mastodon-sidekiq".wantedBy = lib.mkForce [ ];
   systemd.services."mastodon-streaming".wantedBy = lib.mkForce [ ];
   systemd.services."mastodon-web".wantedBy = lib.mkForce [ ];
   systemd.services."postgresqlBackup-mastodon".startAt = lib.mkForce [ ];
diff --git a/mastodon.nix b/mastodon.nix
index 806c6d6..852d63f 100644
--- a/mastodon.nix
+++ b/mastodon.nix
@@ -34,6 +34,29 @@ let
     };
   };
 
+  sidekiq-manager = pkgs.writers.writePython3 "sidekiq-manager" {} ''
+    from itertools import permutations
+    from subprocess import Popen
+
+
+    def sidekiq(queues, connections=16):
+        mastodon = "${mastodon-lor-sh}"
+        cmd = [f"{mastodon}/bin/sidekiq", "-r", mastodon]
+        cmd += ["-c", f"{connections}"]
+        for q in queues:
+            cmd += ['-q', q]
+        return Popen(cmd)
+
+
+    procs = [sidekiq(['mailers', 'pull'])]
+
+    queues = ['default', 'push', 'ingress']
+    procs += [sidekiq(qs) for qs in permutations(queues)]
+
+    p = sidekiq([])
+    p.wait()
+  '';
+
   s3cmd = pkgs.writeShellScript "s3cmd" ''
     ${pkgs.s3cmd}/bin/s3cmd \
       --access_key='${secrets.backup.accessKey}' \
@@ -91,6 +114,9 @@ in {
       rm mastodon.sql.gz.gpg
     '';
 
+  systemd.services.mastodon-sidekiq-all.serviceConfig.ExecStart =
+    lib.mkForce "${sidekiq-manager}";
+
   # https://github.com/mperham/sidekiq/wiki/Memory#bloat
   systemd.services.mastodon-sidekiq-all.environment.MALLOC_ARENA_MAX = "2";
 
@@ -168,7 +194,5 @@ in {
       DEEPL_API_KEY = secrets.DEEPL_API_KEY;
       DEEPL_PLAN = "pro";
     };
-
-    sidekiqThreads = 128;
   };
 }