From de88c0ab487ae659ecad41990188b2bf4eedf3d9 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Sun, 6 Nov 2011 19:35:20 -0800
Subject: [PATCH] correct newrelic_ignore
---
app/controllers/publics_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 160373bf64..a245255341 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -3,7 +3,7 @@
# the COPYRIGHT file.
require File.join(Rails.root, 'lib', 'stream', 'public')
-require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
+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')
@@ -11,7 +11,7 @@ class PublicsController < ApplicationController
require File.join(Rails.root, '/lib/postzord/receiver/private')
include Diaspora::Parser
- newrelic_ignore if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
+ newrelic_ignore if File.exists?(File.expand_path("#{Rails.root}/config/newrelic.yml", __FILE__))
skip_before_filter :set_header_data
skip_before_filter :which_action_and_user
--
GitLab