Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## [Unreleased]

- `RAILS_ENV` of the systemd service now comes from `:rails_env`, falling back to `:stage` [#8](https://github.com/codeur/capistrano-solid_queue/issues/8). Run `cap <stage> solid_queue:install` again to update an installed service.

## [0.1.2] - 2025-06-12

- Quiet task only runs on :solid_queue_role [#3](https://github.com/codeur/capistrano-solid_queue/pull/5) by [@bashcoder](https://github.com/bashcoder)
Expand Down
2 changes: 1 addition & 1 deletion lib/capistrano/templates/solid_queue.service.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ After=syslog.target network.target

[Service]
Type=simple
Environment='RAILS_ENV=<%= fetch(:stage) %>'
Environment='RAILS_ENV=<%= fetch(:rails_env, fetch(:stage)) %>'
<% fetch(:default_env).reject{ |k, _| k.to_s == 'path' }.each do |variable, value| -%>
Environment='<%= variable.to_s.upcase %>=<%= value.to_s %>'
<% end -%>
Expand Down
50 changes: 50 additions & 0 deletions test/capistrano/test_service_unit.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# frozen_string_literal: true

require "test_helper"
require "fileutils"
require "open3"
require "tmpdir"

class Capistrano::TestServiceUnit < Minitest::Test
def test_rails_env_is_capistrano_rails_env
unit = generate_unit(stage_config: 'set :rails_env, "production"')

assert_includes unit, "Environment='RAILS_ENV=production'"
end

def test_rails_env_defaults_to_stage
unit = generate_unit

assert_includes unit, "Environment='RAILS_ENV=preprod'"
end

private

def generate_unit(stage_config: "")
Dir.mktmpdir do |dir|
FileUtils.mkdir_p(File.join(dir, "config", "deploy"))
File.write(File.join(dir, "Capfile"), <<~RUBY)
require "capistrano/setup"
require "capistrano/deploy"
require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git
require "capistrano/solid_queue"
install_plugin Capistrano::SolidQueue::Systemd
RUBY
File.write(File.join(dir, "config", "deploy.rb"), <<~RUBY)
set :application, "app"
set :deploy_to, "/var/www/app"
set :sshkit_backend, SSHKit::Backend::Local
RUBY
File.write(File.join(dir, "config", "deploy", "preprod.rb"), <<~RUBY)
server "localhost", roles: %w[db]
#{stage_config}
RUBY

output, status = Open3.capture2e(RbConfig.ruby, Gem.bin_path("capistrano", "cap"), "preprod", "solid_queue:generate", chdir: dir)
assert status.success?, output

File.read(File.join(dir, "solid_queue.service"))
end
end
end
Loading