From a830d17554855228f2e7afb716d2de496c3f21ca Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 17 Apr 2013 23:04:39 +0200
Subject: [PATCH] Fix newrelic

I updated newrelic to beta version, which fixed problems with starting
the dispatcher in some of the environments.
---
 Gemfile.lock               | 4 ++--
 config.ru                  | 1 -
 lib/travis/api/app/base.rb | 4 ++++
 travis-api.gemspec         | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 97eeaaf9..8b409a92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ PATH
     travis-api (0.0.1)
       backports (~> 2.5)
       hubble (~> 0.1)
-      newrelic_rpm (~> 3.6.0.83)
+      newrelic_rpm (~> 3.6.1.85.beta)
       pg (~> 0.13.2)
       rack-contrib (~> 1.1)
       rack-ssl (~> 1.3, >= 1.3.3)
@@ -184,7 +184,7 @@ GEM
     multipart-post (1.2.0)
     net-http-persistent (2.8)
     net-http-pipeline (1.0.1)
-    newrelic_rpm (3.6.0.83)
+    newrelic_rpm (3.6.1.85.beta)
     pg (0.13.2)
     polyglot (0.3.3)
     pry (0.9.12)
diff --git a/config.ru b/config.ru
index 593f757b..8fb5947a 100644
--- a/config.ru
+++ b/config.ru
@@ -4,7 +4,6 @@ ENV['RAILS_ENV']  = ENV['RACK_ENV']
 
 $stdout.sync = true
 
-require 'newrelic_rpm'
 require 'travis/api/app'
 require 'core_ext/module/load_constants'
 
diff --git a/lib/travis/api/app/base.rb b/lib/travis/api/app/base.rb
index e4edfefc..f975fbb1 100644
--- a/lib/travis/api/app/base.rb
+++ b/lib/travis/api/app/base.rb
@@ -7,6 +7,10 @@ class Travis::Api::App
   class Base < Sinatra::Base
     register Extensions::SmartConstants
 
+    configure :production do
+      require 'newrelic_rpm'
+    end
+
     error NotImplementedError do
       content_type :txt
       status 501
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 535c14b8..7256bc1d 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -182,7 +182,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'hubble',          '~> 0.1'
   s.add_dependency 'backports',       '~> 2.5'
   s.add_dependency 'pg',              '~> 0.13.2'
-  s.add_dependency 'newrelic_rpm',    '~> 3.6.0.83'
+  s.add_dependency 'newrelic_rpm',    '~> 3.6.1.85.beta'
   s.add_dependency 'thin',            '~> 1.4'
   s.add_dependency 'sinatra',         '~> 1.3'
   s.add_dependency 'sinatra-contrib', '~> 1.3'