From 6f002b66d856419aec3a23c697be4864c60da6bd Mon Sep 17 00:00:00 2001
From: Kevin McConnell <kevin@37signals.com>
Date: Wed, 10 Dec 2025 08:52:34 +0000
Subject: [PATCH] In non-SaaS, run jobs in container by default

---
 bin/dev        | 4 ++--
 config/puma.rb | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/dev b/bin/dev
index 51d232d91..d01747dd3 100755
--- a/bin/dev
+++ b/bin/dev
@@ -4,8 +4,8 @@ bin/rails runner - <<EOF
   puts "Login with david@example.com to: http://fizzy.localhost:3006/"
 EOF
 
-if [ -f tmp/solid-queue.txt ]; then
-  export SOLID_QUEUE_IN_PUMA=1
+if [ ! -f tmp/solid-queue.txt ]; then
+  export SOLID_QUEUE_IN_PUMA=false
 fi
 
 if [ -f tmp/oss-config.txt ]; then
diff --git a/config/puma.rb b/config/puma.rb
index 489ae0779..70ca6ebb4 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -7,8 +7,11 @@ pidfile ENV.fetch("PIDFILE", "tmp/pids/server.pid")
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
 
-# Run Solid Queue with Puma
-plugin :solid_queue if ENV["SOLID_QUEUE_IN_PUMA"]
+# Run Solid Queue with Puma by default.
+# Disabled when running fizzy-saas or via SOLID_QUEUE_IN_PUMA=false.
+unless Fizzy.saas? || ENV["SOLID_QUEUE_IN_PUMA"] == "false"
+  plugin :solid_queue
+end
 
 # Expose Prometheus metrics at http://0.0.0.0:9394/metrics (SaaS only).
 # In dev, overridden to http://127.0.0.1:9306/metrics in .mise.toml.