PfacctRateLimitCacheTtl is a string

inverse-inc · Jan 14, 2025 · 86b00d6 · 86b00d6
1 parent 241e393
commit 86b00d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/go/cmd/pfacct/pfacct.go b/go/cmd/pfacct/pfacct.go
@@ -174,10 +174,12 @@ func (pfAcct *PfAcct) SetupConfig(ctx context.Context) {
 	pfconfigdriver.FetchDecodeSocket(ctx, &RadiusConfiguration)
 	pfAcct.ProcessBandwidthAcct = sharedutils.IsEnabled(RadiusConfiguration.ProcessBandwidthAccounting)
 	pfAcct.RateLimit = sharedutils.IsEnabled(RadiusConfiguration.PfacctRateLimit)
-	pfAcct.PfacctRateLimitCacheTtl = RadiusConfiguration.PfacctRateLimitCacheTtl
-	pfAcct.RateLimitCache = cache.New(time.Duration(RadiusConfiguration.PfacctRateLimitCacheTtl)*time.Minute, 10*time.Minute)
-	pfAcct.MacNasCache = cache.New(time.Duration(RadiusConfiguration.PfacctRateLimitCacheTtl)*time.Minute, 10*time.Minute)
-
+	pfAcct.PfacctRateLimitCacheTtl = 5
+	if i, err := strconv.Atoi(RadiusConfiguration.PfacctRateLimitCacheTtl); err != nil {
+		pfAcct.PfacctRateLimitCacheTtl = i
+	}
+	pfAcct.RateLimitCache = cache.New(time.Duration(pfAcct.PfacctRateLimitCacheTtl)*time.Minute, 10*time.Minute)
+	pfAcct.MacNasCache = cache.New(time.Duration(pfAcct.PfacctRateLimitCacheTtl)*time.Minute, 10*time.Minute)
 	if !pfAcct.ProcessBandwidthAcct {
 		logInfo(ctx, "Not processing bandwidth accounting records. To enable set radius_configuration.process_bandwidth_accounting = enabled")
 	}

diff --git a/go/pfconfigdriver/structs.go b/go/pfconfigdriver/structs.go
@@ -712,7 +712,7 @@ type PfConfRadiusConfiguration struct {
 	PfacctWorkers                      string   `json:"pfacct_workers"`
 	PfacctWorkQueueSize                string   `json:"pfacct_work_queue_size"`
 	PfacctRateLimit                    string   `json:"pfacct_rate_limit"`
-	PfacctRateLimitCacheTtl            int      `json:"pfacct_rate_limit_cache_ttl"`
+	PfacctRateLimitCacheTtl            string   `json:"pfacct_rate_limit_cache_ttl"`
 }
 
 type PfQueueConfig struct {