From 80fc10ebf75870f8fc6c98624a2caa38ea582d1e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 21 Mar 2024 08:10:37 -0500
Subject: [PATCH] feat(prosody): Cleans up gc settings.

Reverts 69bba17 and some parts of 2798426.
---
 .../rootfs/defaults/conf.d/brewery.cfg.lua    | 24 -------------------
 .../rootfs/defaults/conf.d/visitors.cfg.lua   | 23 ------------------
 2 files changed, 47 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
index 6e79ef5..a139f98 100644
--- a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
@@ -5,30 +5,6 @@
 {{ $JVB_XMPP_INTERNAL_MUC_DOMAIN := .Env.JVB_XMPP_INTERNAL_MUC_DOMAIN | default "muc.jvb.meet.jitsi" -}}
 {{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}}
 
-{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
-{{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
-{{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
-{{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}
-{{ $GC_GEN_MIN_TH := .Env.GC_GEN_MIN_TH | default 20 -}}
-{{ $GC_GEN_MAX_TH := .Env.GC_GEN_MAX_TH | default 100 -}}
-
---Prosody garbage collector settings
---For more information see https://prosody.im/doc/advanced_gc
-{{ if eq $GC_TYPE "generational" }}
-gc = {
-    mode = "generational";
-    minor_threshold = {{ $GC_GEN_MIN_TH }};
-    major_threshold = {{ $GC_GEN_MAX_TH }};
-}
-{{ else }}
-gc = {
-	mode = "incremental";
-	threshold = {{ $GC_INC_TH }};
-	speed = {{ $GC_INC_SPEED }};
-	step_size = {{ $GC_INC_STEP_SIZE }};
-}
-{{ end }}
-
 admins = {
     "focus@{{ $JVB_XMPP_AUTH_DOMAIN }}",
     "{{ $JVB_AUTH_USER }}@{{ $JVB_XMPP_AUTH_DOMAIN }}"
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index a9e0f5e..a082b5b 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -3,12 +3,6 @@
 {{ $ENABLE_RATE_LIMITS := .Env.PROSODY_ENABLE_RATE_LIMITS | default "0" | toBool -}}
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
 {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}}
-{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
-{{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
-{{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
-{{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}
-{{ $GC_GEN_MIN_TH := .Env.GC_GEN_MIN_TH | default 20 -}}
-{{ $GC_GEN_MAX_TH := .Env.GC_GEN_MAX_TH | default 100 -}}
 {{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
 {{ $JIGASI_TRANSCRIBER_USER := .Env.JIGASI_TRANSCRIBER_USER | default "transcriber" -}}
 {{ $LIMIT_MESSAGES_CHECK_TOKEN := .Env.PROSODY_LIMIT_MESSAGES_CHECK_TOKEN | default "0" | toBool -}}
@@ -42,23 +36,6 @@
 {{ $XMPP_SERVER_S2S_PORT := .Env.XMPP_SERVER_S2S_PORT | default $S2S_PORT -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
 
---Prosody garbage collector settings
---For more information see https://prosody.im/doc/advanced_gc
-{{ if eq $GC_TYPE "generational" }}
-gc = {
-    mode = "generational";
-    minor_threshold = {{ $GC_GEN_MIN_TH }};
-    major_threshold = {{ $GC_GEN_MAX_TH }};
-}
-{{ else }}
-gc = {
-	mode = "incremental";
-	threshold = {{ $GC_INC_TH }};
-	speed = {{ $GC_INC_SPEED }};
-	step_size = {{ $GC_INC_STEP_SIZE }};
-}
-{{ end }}
-
 plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" }
 
 muc_mapper_domain_base = "v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}";