Commit 918284a8 authored by danielgrippi's avatar danielgrippi
Browse files

include newrelic if the newrelic config file is present. profiling ftw.

parent 7363bf34

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config/oauth_keys.yml 
config/initializers/secret_token.rb

config/redis.conf

config/deploy_config.yml

config/newrelic.yml

.bundle

vendor/bundle/*

config/database.yml

Gemfile

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ gem 'jammit', '0.5.4' 
gem 'rest-client', '1.6.1'

gem 'typhoeus'



gem 'newrelic_rpm', :require => false



#Backups

gem 'cloudfiles', '1.4.10', :require => false

Gemfile.lock

+2 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ GEM 
    net-ssh (2.0.24)

    net-ssh-gateway (1.1.0)

      net-ssh (>= 1.99.1)

    newrelic_rpm (3.0.1)

    nokogiri (1.4.3.1)

    oa-basic (0.2.6)

      oa-core (= 0.2.6)
@@ -428,6 +429,7 @@ DEPENDENCIES 
  mini_magick (= 3.2)

  mongrel

  mysql2 (= 0.2.6)

  newrelic_rpm

  nokogiri

  ohai (= 0.5.8)

  omniauth (= 0.2.6)

config/environment.rb

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
#   licensed under the Affero General Public License version 3 or later.  See

#   the COPYRIGHT file.



# use newrelic if configured via config/newrelic.yml

require 'newrelic_rpm' if File.exists?(Rails.root.to_s << '/config/newrelic.yml')



# Load the rails application

require File.expand_path('../application', __FILE__)

Haml::Template.options[:format] = :html5