Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)

2019-07-02 01:01:17 +02:00 · 2019-07-02 01:01:17 +02:00 · 769bbd511f
parent 5d79df0273
commit 769bbd511f
1 changed files with 5 additions and 3 deletions
--- a/app/lib/sidekiq_error_handler.rb
+++ b/app/lib/sidekiq_error_handler.rb
@ -3,9 +3,11 @@
 class SidekiqErrorHandler
  def call(*)
    yield
-  rescue Mastodon::HostValidationError => e
-    Rails.logger.error "#{e.class}: #{e.message}"
-    Rails.logger.error e.backtrace.join("\n")
+  rescue Mastodon::HostValidationError
    # Do not retry
+  ensure
+    socket = Thread.current[:statsd_socket]
+    socket&.close
+    Thread.current[:statsd_socket] = nil
  end
 end