possible variations for Heroku ENV settings

jeremy · Aug 24, 2011 · 7921bdc · 7921bdc
1 parent 93e7f38
commit 7921bdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/new_relic/control/configuration.rb b/lib/new_relic/control/configuration.rb
@@ -67,7 +67,8 @@ def apdex_t
       end
 
       def license_key
-        fetch('license_key', ENV['NEWRELIC_LICENSE_KEY'])
+        env_setting = ENV['NEW_RELIC_LICENSE_KEY'] || ENV['NEWRELIC_LICENSE_KEY']
+        fetch('license_key', env_setting)
       end
 
       def capture_params

diff --git a/lib/new_relic/control/instance_methods.rb b/lib/new_relic/control/instance_methods.rb
@@ -45,6 +45,7 @@ module InstanceMethods
       #
       def init_plugin(options={})
         options['app_name'] = ENV['NEWRELIC_APP_NAME'] if ENV['NEWRELIC_APP_NAME']
+        options['app_name'] ||= ENV['NEW_RELIC_APP_NAME'] if ENV['NEW_RELIC_APP_NAME']
 
         # Merge the stringified options into the config as overrides:
         logger_override = options.delete(:log)