RUBY-1773 Consider APP_ENV when determining environment

newrelic · May 16, 2017 · dcf3bbe · dcf3bbe
1 parent a41ec84
commit dcf3bbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@
 
   The Ruby agent has been validated against the latest release of Ruby on Rails!
 
+  * APP_ENV considered when determining environment
+
+  The agent will now consider the APP_ENV environment when starting up.
+
 ## v4.1.0 ##
 
   * Developer Mode removed

diff --git a/lib/new_relic/control/frameworks/ruby.rb b/lib/new_relic/control/frameworks/ruby.rb
@@ -8,8 +8,8 @@ module Frameworks
       # A control used when no framework is detected - the default.
       class Ruby < NewRelic::Control
         def env
-          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] ||
-                   ENV['RAILS_ENV']     || ENV['RACK_ENV'] || 'development'
+          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] || ENV['RAILS_ENV'] ||
+                   ENV['APP_ENV']       || ENV['RACK_ENV'] || 'development'
         end
 
         def root