lib/new_relic/agent/agent.rb in newrelic_rpm-2.8.4 vs lib/new_relic/agent/agent.rb in newrelic_rpm-2.8.5

@@ -302,11 +302,11 @@
       setup_log unless @log
       @log
     end
     
     def apdex_t
-      @apdex_t ||= (config['apdex_t'] || 2.0).to_f
+      @apdex_t ||= config['apdex_t'].to_f
     end    
         
     private
     
     # Connect to the server, and run the worker loop forever.  Will not return.
@@ -464,10 +464,10 @@
       
       @stats_engine = NewRelic::Agent::StatsEngine.new
       @transaction_sampler = NewRelic::Agent::TransactionSampler.new(self)
       @error_collector = NewRelic::Agent::ErrorCollector.new(self)
       
-      @request_timeout = 15 * 60
+      @request_timeout = NewRelic::Config.instance.fetch('timeout', 2 * 60)
       
       @invalid_license = false
       
       @last_harvest_time = Time.now
     end