Merge pull request #2051 from basecamp/run-jobs-by-default

In non-SaaS, run jobs in container by default
This commit is contained in:
Kevin McConnell
2025-12-10 16:59:24 +00:00
committed by GitHub
2 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -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
+5 -2
View File
@@ -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.