Skip to content

Commit

Permalink
Merge pull request #2390 from fransan6/refactor-local-env-methods
Browse files Browse the repository at this point in the history
Refactor local_environment methods
  • Loading branch information
fallwith authored Jan 8, 2024
2 parents 01befa0 + f519cc0 commit ce95239
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions lib/new_relic/local_environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,24 @@ def check_for_mongrel
end

def check_for_unicorn
if (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) && NewRelic::LanguageSupport.object_space_usable?
v = find_class_in_object_space(::Unicorn::HttpServer)
@discovered_dispatcher = :unicorn if v
end
return unless (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) &&
NewRelic::LanguageSupport.object_space_usable?

v = find_class_in_object_space(::Unicorn::HttpServer)
@discovered_dispatcher = :unicorn if v
end

def check_for_puma
if defined?(::Puma) && File.basename($0) == 'puma'
@discovered_dispatcher = :puma
end
return unless defined?(::Puma) && File.basename($0) == 'puma'

@discovered_dispatcher = :puma
end

def check_for_falcon
if defined?(::Falcon::Server) && NewRelic::LanguageSupport.object_space_usable?
@discovered_dispatcher = :falcon if find_class_in_object_space(::Falcon::Server)
end
return unless defined?(::Falcon::Server) &&
NewRelic::LanguageSupport.object_space_usable?

@discovered_dispatcher = :falcon if find_class_in_object_space(::Falcon::Server)
end

def check_for_delayed_job
Expand Down Expand Up @@ -185,15 +187,15 @@ def check_for_thin
end

def check_for_litespeed
if caller.pop.include?('fcgi-bin/RailsRunner.rb')
@discovered_dispatcher = :litespeed
end
return unless caller.pop.include?('fcgi-bin/RailsRunner.rb')

@discovered_dispatcher = :litespeed
end

def check_for_passenger
if defined?(::PhusionPassenger)
@discovered_dispatcher = :passenger
end
return unless defined?(::PhusionPassenger)

@discovered_dispatcher = :passenger
end

public
Expand Down

0 comments on commit ce95239

Please sign in to comment.