diff options
| author | feld <feld@feld.me> | 2024-02-17 16:21:55 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-02-17 16:21:55 +0000 |
| commit | 0b9bc4a0d0e44a873bc59e8994f1996499ed0c4b (patch) | |
| tree | 4c08ca45b82468b5acd9f9bf6d67feddbd8ed3e9 | |
| parent | a145d909b51a66fd332b9f4ad570901296a3b65c (diff) | |
| parent | 7e99d0619d02835fab66134f14dd99fb4c313d26 (diff) | |
Merge branch 'memleak' into 'develop'
Force more frequent full_sweep GC runs on the Websocket processes
See merge request pleroma/pleroma!4060
| -rw-r--r-- | changelog.d/memleak.fix | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/memleak.fix b/changelog.d/memleak.fix new file mode 100644 index 000000000..2465921c0 --- /dev/null +++ b/changelog.d/memleak.fix @@ -0,0 +1 @@ +Fix a memory leak caused by Websocket connections that would not enter a state where a full garbage collection run could be triggered. diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 51a77ed60..2e2104904 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -14,7 +14,8 @@ defmodule Pleroma.Web.Endpoint do websocket: [ path: "/", compress: false, - error_handler: {Pleroma.Web.MastodonAPI.WebsocketHandler, :handle_error, []} + error_handler: {Pleroma.Web.MastodonAPI.WebsocketHandler, :handle_error, []}, + fullsweep_after: 20 ] ) @@ -27,7 +28,8 @@ defmodule Pleroma.Web.Endpoint do ], timeout: 60_000, transport_log: false, - compress: false + compress: false, + fullsweep_after: 20 ], longpoll: false ) |