agent.rb in newrelic_rpm-3.16.3.323

- old
+ new

@@ -69,10 +69,12 @@
         @custom_event_aggregator      = NewRelic::Agent::CustomEventAggregator.new
 
         @connect_state      = :pending
         @connect_attempts   = 0
         @environment_report = nil
+        @waited_on_connect  = nil
+        @connected_pid      = nil
 
         @wait_on_connect_reader, @wait_on_connect_writer = IO.pipe
 
         setup_attribute_filter
       end
@@ -470,10 +472,10 @@
               NewRelic::LanguageSupport.can_fork? &&
               !NewRelic::Agent::PipeChannelManager.listener.started?
           end
 
           def in_resque_child_process?
-            @service.is_a?(NewRelic::Agent::PipeService)
+            defined?(@service) && @service.is_a?(NewRelic::Agent::PipeService)
           end
 
           # Sanity-check the agent configuration and start the agent,
           # setting up the worker thread and the exit handler to shut
           # down the agent