commit: fb0e3403632ed10ba7d226d998618e0a894d2538
parent 274c8e6fabeb65813f76766ccaa22227168c726e
Author: rinpatch <rinpatch@sdf.org>
Date: Wed, 21 Oct 2020 21:13:49 +0300
Rip out fedsockets from the release branch
Diffstat:
4 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,7 +27,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
- Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
- Pleroma API: Importing the mutes users from CSV files.
-- Experimental websocket-based federation between Pleroma instances.
<details>
<summary>API Changes</summary>
diff --git a/config/config.exs b/config/config.exs
@@ -130,7 +130,9 @@ config :pleroma, Pleroma.Web.Endpoint,
dispatch: [
{:_,
[
- {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []},
+ # FedSockets are commented out of the dispatch table on stable because they can't even
+ # fail properly when they are disabled. They will hang the connection instead of returning a 404.
+ # {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []},
{"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
{"/websocket", Phoenix.Endpoint.CowboyWebSocket,
{Phoenix.Transports.WebSocket,
diff --git a/config/description.exs b/config/description.exs
@@ -275,19 +275,6 @@ config :pleroma, :config_description, [
},
%{
group: :pleroma,
- key: :fed_sockets,
- type: :group,
- description: "Websocket based federation",
- children: [
- %{
- key: :enabled,
- type: :boolean,
- description: "Enable FedSockets"
- }
- ]
- },
- %{
- group: :pleroma,
key: Pleroma.Emails.Mailer,
type: :group,
description: "Mailer-related settings",
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
@@ -219,16 +219,6 @@ config :pleroma, :mrf_user_allowlist, %{
* `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`)
* `enabled`: whether scheduled activities are sent to the job queue to be executed
-## FedSockets
-FedSockets is an experimental feature allowing for Pleroma backends to federate using a persistant websocket connection as opposed to making each federation a seperate http connection. This feature is currently off by default. It is configurable throught he following options.
-
-### :fedsockets
-* `enabled`: Enables FedSockets for this instance. `false` by default.
-* `connection_duration`: Time an idle websocket is kept open.
-* `rejection_duration`: Failures to connect via FedSockets will not be retried for this period of time.
-* `fed_socket_fetches` and `fed_socket_rejections`: Settings passed to `cachex` for the fetch registry, and rejection stacks. See `Pleroma.Web.FedSockets` for more details.
-
-
## Frontends
### :frontend_configurations
