From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 1 Jul 2019 23:01:17 +0000 (+0200)
Subject: Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1a747f7020b6888f84ef54d1631f85bf748da868;p=mastodon.git

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

diff --git a/app/lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb
index 23785cf05..8eb6b942d 100644
--- 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