From: rinpatch <rinpatch@sdf.org>
Date: Thu, 10 Sep 2020 10:48:24 +0000 (+0300)
Subject: Websocket handler: do not raise if handler is terminated before switching protocols
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e16e8f98169f822416c18778abfa8495a486c8f2;p=akkoma

Websocket handler: do not raise if handler is terminated before switching protocols

Closes #2131
---

diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex
index e6010bb4a..5090d9622 100644
--- a/lib/pleroma/web/mastodon_api/websocket_handler.ex
+++ b/lib/pleroma/web/mastodon_api/websocket_handler.ex
@@ -100,6 +100,10 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
     {:reply, :ping, %{state | timer: nil, count: 0}, :hibernate}
   end
 
+  # State can be `[]` only in case we terminate before switching to websocket,
+  # we already log errors for these cases in `init/1`, so just do nothing here
+  def terminate(_reason, _req, []), do: :ok
+
   def terminate(reason, _req, state) do
     Logger.debug(
       "#{__MODULE__} terminating websocket connection for user #{