diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb index c6d8bbc76..6131f202f 100644 --- a/app/controllers/publics_controller.rb +++ b/app/controllers/publics_controller.rb @@ -3,15 +3,13 @@ # the COPYRIGHT file. require File.join(Rails.root, 'lib', 'stream', 'public') -require 'newrelic_rpm' if File.exists?(File.expand_path("#{Rails.root}/config/newrelic.yml", __FILE__)) - class PublicsController < ApplicationController require File.join(Rails.root, '/lib/diaspora/parser') require File.join(Rails.root, '/lib/postzord/receiver/public') require File.join(Rails.root, '/lib/postzord/receiver/private') include Diaspora::Parser - newrelic_ignore if File.exists?(File.expand_path("#{Rails.root}/config/newrelic.yml", __FILE__)) + newrelic_ignore if EnviromentConfiguration.using_new_relic? skip_before_filter :set_header_data skip_before_filter :which_action_and_user diff --git a/lib/enviroment_configuration.rb b/lib/enviroment_configuration.rb index 6e35cad40..43fcd4b83 100644 --- a/lib/enviroment_configuration.rb +++ b/lib/enviroment_configuration.rb @@ -36,4 +36,8 @@ module EnviromentConfiguration AppConfig[:ca_file] end end + + def self.using_new_relic? + defined?(NewRelic) && AppConfig['NEW_RELIC_LICENSE_KEY'].present? + end end