rails.rb in newrelic_rpm-4.1.0.333

- old
+ new

@@ -10,11 +10,11 @@
       # Rails specific configuration, instrumentation, environment values,
       # etc.
       class Rails < NewRelic::Control::Frameworks::Ruby
 
         def env
-          @env ||= RAILS_ENV.dup
+          @env ||= ( ENV['NEW_RELIC_ENV'] || RAILS_ENV.dup )
         end
 
         # Rails can return an empty string from this method, causing
         # the agent not to start even when it is properly in a rails 3
         # application, so we test the value to make sure it actually
@@ -56,11 +56,10 @@
           if !Agent.config[:agent_enabled]
             # Might not be running if it does not think mongrel, thin, passenger, etc
             # is running, if it thinks it's a rake task, or if the agent_enabled is false.
             ::NewRelic::Agent.logger.info("New Relic Agent not running.")
           else
-            install_developer_mode(rails_config) if Agent.config[:developer_mode]
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
         rescue => e
           ::NewRelic::Agent.logger.error("Failure during init_config for Rails. Is Rails required in a non-Rails app? Set NEW_RELIC_FRAMEWORK=ruby to avoid this message.",
@@ -90,28 +89,9 @@
             require 'new_relic/rack/browser_monitoring'
             config.middleware.use NewRelic::Rack::BrowserMonitoring
             ::NewRelic::Agent.logger.debug("Installed New Relic Browser Monitoring middleware")
           rescue => e
             ::NewRelic::Agent.logger.warn("Error installing New Relic Browser Monitoring middleware", e)
-          end
-        end
-
-        def install_developer_mode(rails_config)
-          return if defined?(@developer_mode_installed) && @developer_mode_installed
-          @developer_mode_installed = true
-          if rails_config && rails_config.respond_to?(:middleware)
-            begin
-              require 'new_relic/rack/developer_mode'
-              rails_config.middleware.use NewRelic::Rack::DeveloperMode
-              ::NewRelic::Agent.logger.info("New Relic Agent Developer Mode enabled.")
-              if env == "production"
-                ::NewRelic::Agent.logger.warn("***New Relic Developer Mode is not intended to be enabled in production environments! We highly recommend setting developer_mode: false for the production environment in your newrelic.yml.")
-              end
-            rescue => e
-              ::NewRelic::Agent.logger.warn("Error installing New Relic Developer Mode", e)
-            end
-          elsif rails_config
-            ::NewRelic::Agent.logger.warn("Developer mode not available for Rails versions prior to 2.2")
           end
         end
 
         def rails_version
           @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)