lib/new_relic/agent/agent.rb in newrelic_rpm-3.9.9.275 vs lib/new_relic/agent/agent.rb in newrelic_rpm-3.10.0.279

@@ -401,11 +401,11 @@
           def has_license_key?
             if Agent.config[:license_key] && Agent.config[:license_key].length > 0
               true
             else
               ::NewRelic::Agent.logger.warn("No license key found. " +
-                "This often means your newrelic.yml file was not found, or it lacks a section for the running environment, '#{NewRelic::Control.instance.env}'.")
+                "This often means your newrelic.yml file was not found, or it lacks a section for the running environment, '#{NewRelic::Control.instance.env}'. You may also want to try linting your newrelic.yml to ensure it is valid YML.")
               false
             end
           end
 
           # A correct license key exists and is of the proper length
@@ -426,13 +426,13 @@
             end
           end
 
           # If we're using a dispatcher that forks before serving
           # requests, we need to wait until the children are forked
-          # before connecting, otherwise the parent process sends odd data
+          # before connecting, otherwise the parent process sends useless data
           def using_forking_dispatcher?
-            if [:passenger, :rainbows, :unicorn].include? Agent.config[:dispatcher]
-              ::NewRelic::Agent.logger.info 'Connecting workers after forking.'
+            if [:puma, :passenger, :rainbows, :unicorn].include? Agent.config[:dispatcher]
+              ::NewRelic::Agent.logger.info "Deferring startup of agent reporting thread because #{Agent.config[:dispatcher]} may fork."
               true
             else
               false
             end
           end