Skip to content

Commit

Permalink
Added check for STATSD_ADDR setting to emit a warning and proceed rat…
Browse files Browse the repository at this point in the history
…her than crashing if the address is unreachable (mastodon#30691)
  • Loading branch information
timothyjrogers authored and kmycode committed Jul 4, 2024
1 parent 98f36f7 commit e53f6a5
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions config/initializers/statsd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
if ENV['STATSD_ADDR'].present?
host, port = ENV['STATSD_ADDR'].split(':')

statsd = Statsd.new(host, port)
statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
begin
statsd = Statsd.new(host, port)
statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }

NSA.inform_statsd(statsd) do |informant|
informant.collect(:action_controller, :web)
informant.collect(:active_record, :db)
informant.collect(:active_support_cache, :cache)
informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
NSA.inform_statsd(statsd) do |informant|
informant.collect(:action_controller, :web)
informant.collect(:active_record, :db)
informant.collect(:active_support_cache, :cache)
informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
end
rescue
Rails.logger.warn("statsd address #{ENV['STATSD_ADDR']} not reachable, proceeding without statsd")
end
end

0 comments on commit e53f6a5

Please sign in to comment.