opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(cron): use UTC as default timezone, log invalid TZ warning

Browse source 
Address reviewer feedback (yinwm):
- Change hard-coded default from Asia/Shanghai to UTC, which is the
  industry standard for open-source projects (Kubernetes, AWS, etc.)
- Add warning log when time.LoadLocation fails for a configured timezone
  to help users debug misconfiguration
- Update tests to reflect UTC default
This commit is contained in:
王路路 2026-03-04 20:03:49 +08:00
parent a8f2666b23
commit c3281a536b
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/config/config.go
View file

@ -580,7 +580,7 @@ type WebToolsConfig struct {
type CronToolsConfig struct {
ToolConfig ` envPrefix:"PICOCLAW_TOOLS_CRON_"`
ExecTimeoutMinutes int ` env:"PICOCLAW_TOOLS_CRON_EXEC_TIMEOUT_MINUTES" json:"exec_timeout_minutes"` // 0 means no timeout
DefaultTimezone string ` env:"PICOCLAW_TOOLS_CRON_DEFAULT_TIMEZONE" json:"default_timezone"` // default timezone for cron expressions, e.g. "UTC"
DefaultTimezone string ` env:"PICOCLAW_TOOLS_CRON_DEFAULT_TIMEZONE" json:"default_timezone"` // default timezone for cron expressions, e.g. "UTC"
}
type ExecConfig struct {

8
pkg/cron/service.go
View file

@ -267,16 +267,18 @@ func (cs *CronService) computeNextRun(schedule *CronSchedule, nowMS int64) *int6
// Use gronx to calculate next run time
now := time.UnixMilli(nowMS)
// Apply timezone: schedule.TZ > service default > "Asia/Shanghai"
// Apply timezone: schedule.TZ > service default > UTC
tz := schedule.TZ
if tz == "" {
tz = cs.defaultTZ
}
if tz == "" {
tz = "Asia/Shanghai"
tz = "UTC"
}
if loc, err := time.LoadLocation(tz); err == nil {
now = now.In(loc)
} else {
log.Printf("[cron] warning: failed to load timezone '%s': %v, using UTC", tz, err)
}
nextTime, err := gronx.NextTickAfter(schedule.Expr, now, false)
if err != nil {
@ -326,7 +328,7 @@ func (cs *CronService) SetOnJob(handler JobHandler) {
}
// SetDefaultTimezone sets the default timezone for cron expressions.
// If empty, falls back to "Asia/Shanghai".
// If empty, falls back to UTC.
func (cs *CronService) SetDefaultTimezone(tz string) {
cs.mu.Lock()
defer cs.mu.Unlock()

25
pkg/cron/timezone_test.go
View file

@ -33,9 +33,9 @@ func TestComputeNextRun_CronTimezone(t *testing.T) {
wantHour: 1, // 9:00 CST = 1:00 UTC
},
{
name: "empty TZ defaults to Asia/Shanghai",
name: "empty TZ defaults to UTC",
tz: "",
wantHour: 1, // should default to Asia/Shanghai
wantHour: 9, // should default to UTC
},
{
name: "US/Eastern timezone",
@ -73,13 +73,16 @@ func TestComputeNextRun_CronTimezone(t *testing.T) {
}
}
// TestComputeNextRun_DefaultTZ_NotUTC verifies that when TZ is empty,
// the computed next run differs from a pure UTC computation.
func TestComputeNextRun_DefaultTZ_NotUTC(t *testing.T) {
// TestComputeNextRun_DefaultTZ_AppliesWhenSet verifies that when TZ is empty
// and no service default is set, the computation uses UTC.
func TestComputeNextRun_DefaultTZ_AppliesWhenSet(t *testing.T) {
tmpDir := t.TempDir()
storePath := filepath.Join(tmpDir, "jobs.json")
cs := NewCronService(storePath, nil)
// Set a non-UTC default to verify it takes effect
cs.SetDefaultTimezone("Asia/Shanghai")
now := time.Date(2026, 3, 4, 2, 0, 0, 0, time.UTC) // 02:00 UTC = 10:00 CST
nowMS := now.UnixMilli()
@ -93,12 +96,12 @@ func TestComputeNextRun_DefaultTZ_NotUTC(t *testing.T) {
t.Fatal("computeNextRun returned nil")
}
// With empty TZ (default Asia/Shanghai), 9:00 CST already passed (it's 10:00 CST),
// so next run should be tomorrow 9:00 CST = today 01:00 UTC + 24h.
// With UTC, 9:00 UTC hasn't happened yet (it's 02:00 UTC), so next run = today 9:00 UTC.
// They must differ.
// With service default Asia/Shanghai, 9:00 CST already passed (it's 10:00 CST),
// so next run should be tomorrow 9:00 CST.
// With explicit UTC, 9:00 UTC hasn't happened yet (it's 02:00 UTC).
// They must differ, proving SetDefaultTimezone takes effect.
if *nextEmpty == *nextUTC {
t.Errorf("empty TZ and UTC TZ produced same next run time, default TZ is not working")
t.Errorf("service default TZ (Asia/Shanghai) and UTC produced same next run time")
}
}
@ -115,7 +118,7 @@ func TestComputeNextRun_ServiceDefaultTZ(t *testing.T) {
now := time.Date(2026, 3, 4, 0, 0, 0, 0, time.UTC)
nowMS := now.UnixMilli()
// Schedule with empty TZ should use service default (US/Eastern), not Asia/Shanghai
// Schedule with empty TZ should use service default (US/Eastern), not UTC
scheduleEmpty := &CronSchedule{Kind: "cron", Expr: "0 9 * * *", TZ: ""}
scheduleCST := &CronSchedule{Kind: "cron", Expr: "0 9 * * *", TZ: "Asia/Shanghai"}