nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
danielgrippi 2011-06-02 12:09:39 -07:00
parent 7363bf3499
commit 918284a8f8
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,6 +13,7 @@ config/oauth_keys.yml
config/initializers/secret_token.rb config/initializers/secret_token.rb
config/redis.conf config/redis.conf
config/deploy_config.yml config/deploy_config.yml
config/newrelic.yml
.bundle .bundle
vendor/bundle/* vendor/bundle/*
config/database.yml config/database.yml

2
Gemfile
View file

@ -52,6 +52,8 @@ gem 'jammit', '0.5.4'
gem 'rest-client', '1.6.1' gem 'rest-client', '1.6.1'
gem 'typhoeus' gem 'typhoeus'
gem 'newrelic_rpm', :require => false
#Backups #Backups
gem 'cloudfiles', '1.4.10', :require => false gem 'cloudfiles', '1.4.10', :require => false

2
Gemfile.lock
View file

@ -235,6 +235,7 @@ GEM
net-ssh (2.0.24) net-ssh (2.0.24)
net-ssh-gateway (1.1.0) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
newrelic_rpm (3.0.1)
nokogiri (1.4.3.1) nokogiri (1.4.3.1)
oa-basic (0.2.6) oa-basic (0.2.6)
oa-core (= 0.2.6) oa-core (= 0.2.6)
@ -428,6 +429,7 @@ DEPENDENCIES
mini_magick (= 3.2) mini_magick (= 3.2)
mongrel mongrel
mysql2 (= 0.2.6) mysql2 (= 0.2.6)
newrelic_rpm
nokogiri nokogiri
ohai (= 0.5.8) ohai (= 0.5.8)
omniauth (= 0.2.6) omniauth (= 0.2.6)

3
config/environment.rb
View file

@ -2,6 +2,9 @@
# licensed under the Affero General Public License version 3 or later. See # licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file. # 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 # Load the rails application
require File.expand_path('../application', __FILE__) require File.expand_path('../application', __FILE__)
Haml::Template.options[:format] = :html5 Haml::Template.options[:format] = :html5