From: Vasek Sraier <git@vakabus.cz>
Date: Wed, 12 Oct 2022 10:18:51 +0000 (+0200)
Subject: manager: supervisord: renamed gc subprocess to cache-gc
X-Git-Tag: v6.0.0a1~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb58a43855fceee367d41615883d488e55a7b90c;p=thirdparty%2Fknot-resolver.git

manager: supervisord: renamed gc subprocess to cache-gc
---

diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py b/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py
index bf21a2a38..a19fc9430 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py
+++ b/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py
@@ -29,7 +29,8 @@ class SupervisordKresID(KresID):
 
     @staticmethod
     def from_string(val: str) -> "SupervisordKresID":
-        if val == "gc:gc":
+        if val == "cache-gc" or val == "cache-gc:cache-gc":
+            # the double name is checked because thats how we read it from supervisord
             return SupervisordKresID.new(SubprocessType.GC, 0)
         else:
             val = val.replace("kresd:kresd", "")
@@ -37,7 +38,7 @@ class SupervisordKresID(KresID):
 
     def __str__(self) -> str:
         if self.subprocess_type is SubprocessType.GC:
-            return "gc"
+            return "cache-gc"
         elif self.subprocess_type is SubprocessType.KRESD:
             return f"kresd:kresd{self._id}"
         else:
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 b/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2
index 91fd8c7eb..75b4f6b38 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2
+++ b/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2
@@ -66,7 +66,7 @@ environment={{ kresd.environment }}
 stdout_logfile=NONE
 stderr_logfile=NONE
 
-[program:gc]
+[program:cache-gc]
 redirect_stderr=false
 directory={{ gc.workdir }}
 command={{ gc.command }}