Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.

1 files changed, 24 insertions, 0 deletions

diff --git a/lib/sidekiq_error_handler.rb b/lib/sidekiq_error_handler.rb
new file mode 100644
index 000000000..358afd540
--- /dev/null
+++ b/lib/sidekiq_error_handler.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class SidekiqErrorHandler
+  BACKTRACE_LIMIT = 3
+
+  def call(*)
+    yield
+  rescue Mastodon::HostValidationError
+    # Do not retry
+  rescue => e
+    limit_backtrace_and_raise(e)
+  ensure
+    socket = Thread.current[:statsd_socket]
+    socket&.close
+    Thread.current[:statsd_socket] = nil
+  end
+
+  private
+
+  def limit_backtrace_and_raise(exception)
+    exception.set_backtrace(exception.backtrace.first(BACKTRACE_LIMIT))
+    raise exception
+  end
+end