Newrelic now working in thin
This commit is contained in:
parent
23dd975551
commit
9f05ac1f33
2 changed files with 3 additions and 3 deletions
|
|
@ -9,6 +9,9 @@ require 'rails/all'
|
||||||
# you've limited to :test, :development, or :production.
|
# you've limited to :test, :development, or :production.
|
||||||
Bundler.require(:default, Rails.env) if defined?(Bundler)
|
Bundler.require(:default, Rails.env) if defined?(Bundler)
|
||||||
|
|
||||||
|
# use newrelic if configured via config/newrelic.yml
|
||||||
|
require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
|
||||||
|
|
||||||
require File.expand_path('../../lib/fake', __FILE__)
|
require File.expand_path('../../lib/fake', __FILE__)
|
||||||
|
|
||||||
module Diaspora
|
module Diaspora
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,6 @@
|
||||||
# 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?(File.expand_path('../newrelic.yml', __FILE__))
|
|
||||||
|
|
||||||
# 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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue