mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-06-01 00:18:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'memleak' into 'develop'

Browse source 
Force more frequent full_sweep GC runs on the Websocket processes

See merge request pleroma/pleroma!4060
This commit is contained in:
feld 2024-02-17 16:21:55 +00:00
parent a145d909b5 7e99d0619d
commit 0b9bc4a0d0
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/memleak.fix Normal file
View file

@ -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.

6
lib/pleroma/web/endpoint.ex
View file

@ -14,7 +14,8 @@ defmodule Pleroma.Web.Endpoint do
websocket: [ websocket: [
path: "/", path: "/",
compress: false, 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, timeout: 60_000,
transport_log: false, transport_log: false,
compress: false compress: false,
fullsweep_after: 20
], ],
longpoll: false longpoll: false
) )