lib/new_relic/agent/agent.rb in newrelic_rpm-3.1.0.beta2 vs lib/new_relic/agent/agent.rb in newrelic_rpm-3.1.0.beta3

@@ -994,13 +994,19 @@
 
         def graceful_disconnect
           if @connected
             begin
               @request_timeout = 10
-#              log.debug "Flushing unsent metric data to server"
-#              harvest_and_send_timeslice_data
-              log.debug "Serializing agent data to disk"
-              NewRelic::Agent.save_data
+              if NewRelic::DataSerialization.should_send_data?
+                log.debug "Sending data to New Relic Service"
+                NewRelic::Agent.load_data
+                harvest_and_send_errors
+                harvest_and_send_slowest_sample
+                harvest_and_send_timeslice_data
+              else
+                log.debug "Serializing agent data to disk"
+                NewRelic::Agent.save_data
+              end
               if @connected_pid == $$
                 log.debug "Sending New Relic service agent run shutdown message"
                 invoke_remote :shutdown, @agent_id, Time.now.to_f
               else
                 log.debug "This agent connected from parent process #{@connected_pid}--not sending shutdown"