@@ -5,7 +5,7 @@ require 'new_relic/config' # newrelic_agent log files. # # If you can't find any log files and you don't see anything in your -# application log files, try uncommenting these lines to verify +# application log files, try uncommenting the following line to verify # the plugin is being loaded, then contact support@newrelic.com # if you are unable to resolve the issue. init.rb @@ -63,10 +63,9 @@ module NewRelic # Still can't find the port. Let's look at ARGV to fall back @identifier = default_port if @identifier.nil? end - - def check_for_thin + def check_for_thin if defined? Thin::Server - # This case covers the thin web server + # This case covers the thin web dispatcher # Same issue as above- we assume only one instance per process ObjectSpace.each_object(Thin::Server) do |thin_server| @environment = :thin @@ -82,6 +81,10 @@ module NewRelic end end # each thin instance end + if defined?(Thin::VERSION) && !@identifier + @environment = :thin + @identifier = default_port + end end def check_for_jruby lib/new_relic/local_environment.rb @@ -12,6 +12,7 @@ module NewRelic CHANGELOG = <<EOF 2009-04-29 version 2.8.10 + * fix thin support with rails 2.3.2 when using script/server * fix incompatibility with rails 2.3.2 and script/server options processing * minor tweak to environment gathering for gem mode 2009-04-17 version 2.8.9 lib/new_relic/version.rb 5299b1f674da446d13347d74ae13c918d75950fc Bill Kayser bkayser@newrelic.com http://github.com/mislav/newrelic_rpm/commit/7fe7e2ab8cf7eeb5f2cf3559e5e1fa667b444e55 7fe7e2ab8cf7eeb5f2cf3559e5e1fa667b444e55 2009-05-03T09:51:10-07:00 2009-05-03T09:51:10-07:00 Fix incompatibility with thin and script/server in 2.3.2 de0aa67054f3f8a74639a2c032f2e51b776ba09d Bill Kayser bkayser@newrelic.com