1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

Check RAILS_ENV before RACK_ENV (#4494)

This commit is contained in:
roberts1000 2020-03-16 17:32:46 -04:00 committed by GitHub
parent d4d8b209de
commit 40e82fa05d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -8,6 +8,7 @@ HEAD
- Integrate with systemd's watchdog and notification features [#4488]
See `Type=notify` in [systemd.service](https://www.freedesktop.org/software/systemd/man/systemd.service.html#Options)
- Fix edge case where a job can be pushed without a queue.
- Check RAILS_ENV before RACK_ENV. [#4493]
6.0.5
---------

View file

@ -185,8 +185,8 @@ module Sidekiq
# See #984 for discussion.
# APP_ENV is now the preferred ENV term since it is not tech-specific.
# Both Sinatra 2.0+ and Sidekiq support this term.
# RACK_ENV and RAILS_ENV are there for legacy support.
@environment = cli_env || ENV["APP_ENV"] || ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
# RAILS_ENV and RACK_ENV are there for legacy support.
@environment = cli_env || ENV["APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
end
def symbolize_keys_deep!(hash)