Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: add embedded timezone data and validation 

- Import time/tzdata to embed timezone database in binary
- Add timezone validation in runJigglerCronTab() to gracefully fallback to UTC
- Add timezone to debug logging in rpcSetJigglerConfig
- Fixes 'unknown time zone' errors when system lacks timezone data
This commit is contained in:
Adam Shiervani 2025-08-19 12:34:15 +02:00
parent 6b7fcfc3b3
commit 2f069ed884
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jiggler.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"math/rand" "math/rand"
"time" "time"
_ "time/tzdata"
"github.com/go-co-op/gocron/v2" "github.com/go-co-op/gocron/v2"
) )
@ -31,7 +32,7 @@ func rpcGetJigglerConfig() (JigglerConfig, error) {
} }
func rpcSetJigglerConfig(jigglerConfig JigglerConfig) error { func rpcSetJigglerConfig(jigglerConfig JigglerConfig) error {
logger.Info().Msgf("jigglerConfig: %v, %v, %v", jigglerConfig.InactivityLimitSeconds, jigglerConfig.JitterPercentage, jigglerConfig.ScheduleCronTab) logger.Info().Msgf("jigglerConfig: %v, %v, %v, %v", jigglerConfig.InactivityLimitSeconds, jigglerConfig.JitterPercentage, jigglerConfig.ScheduleCronTab, jigglerConfig.Timezone)
config.JigglerConfig = &jigglerConfig config.JigglerConfig = &jigglerConfig
err := removeExistingCrobJobs(scheduler) err := removeExistingCrobJobs(scheduler)
if err != nil { if err != nil {
@ -70,9 +71,15 @@ func initJiggler() {
func runJigglerCronTab() error { func runJigglerCronTab() error {
cronTab := config.JigglerConfig.ScheduleCronTab cronTab := config.JigglerConfig.ScheduleCronTab
// Apply timezone if specified // Apply timezone if specified and valid
if config.JigglerConfig.Timezone != "" && config.JigglerConfig.Timezone != "UTC" { if config.JigglerConfig.Timezone != "" && config.JigglerConfig.Timezone != "UTC" {
cronTab = fmt.Sprintf("TZ=%s %s", config.JigglerConfig.Timezone, cronTab) // Validate timezone before applying
if _, err := time.LoadLocation(config.JigglerConfig.Timezone); err != nil {
logger.Warn().Msgf("Invalid timezone '%s', falling back to UTC: %v", config.JigglerConfig.Timezone, err)
// Don't add TZ prefix, let it run in UTC
} else {
cronTab = fmt.Sprintf("TZ=%s %s", config.JigglerConfig.Timezone, cronTab)
}
} }
s, err := gocron.NewScheduler() s, err := gocron.NewScheduler()