RUBY-1401 Re-enable aggressive_keepalive by default

newrelic · Nov 24, 2014 · e04d5ce · e04d5ce
1 parent fe63ae6
commit e04d5ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/new_relic/agent/configuration/default_source.rb b/lib/new_relic/agent/configuration/default_source.rb
@@ -1097,7 +1097,7 @@ def self.convert_to_list(value)
           :description  => 'A dictionary of label names and values that will be applied to the data sent from this agent. May also be expressed as a semi-colon delimited string of colon-separated pairs (e.g. "Server:One;Data Center:Primary".'
         },
         :aggressive_keepalive => {
-          :default      => false,
+          :default      => true,
           :public       => false,
           :type         => Boolean,
           :description  => 'If true, attempt to keep the TCP connection to the collector alive between harvests.'

diff --git a/test/new_relic/agent/new_relic_service_test.rb b/test/new_relic/agent/new_relic_service_test.rb
@@ -130,7 +130,7 @@ def test_requests_after_connection_failure_in_session_still_use_connection_cachi
     end
 
     assert_equal([:start, :request, :finish], conn0.calls)
-    assert_equal([:start, :request, :request, :request, :finish], conn1.calls)
+    assert_equal([:start, :request, :request, :request], conn1.calls)
     assert_equal([], conn2.calls)
   end
 
@@ -157,7 +157,7 @@ def test_repeated_connection_failures
 
     assert_equal([:start, :request, :finish], conn0.calls)
     assert_equal([:start, :request, :finish], conn1.calls)
-    assert_equal([:start, :request, :request, :finish], conn2.calls)
+    assert_equal([:start, :request, :request], conn2.calls)
   end
 
   def test_repeated_connection_failures_on_reconnect