mixeme
e85cbc4eb1
A per-job timeout now has three distinct states: unset inherits the global default, an explicit 0 means no timeout and does not inherit, and a positive value is the per-job limit. Job.TimeoutSeconds became *int so unset and 0 stay distinguishable in jobs.json. Also fixes the global default, which could not persist a 0. loadOrCreateConfig normalized DefaultTimeoutSeconds <= 0 back to 30 on every read of an existing gosentry.json, so "no timeout" only held until the next restart. The field is now written unconditionally (no omitempty) and read back as-is. Existing jobs and configs are unaffected: a job with no timeout_seconds still inherits, and a saved global default of 30 stays 30. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
34 lines
1.6 KiB
Go
34 lines
1.6 KiB
Go
package domain
|
|
|
|
// Job is the user-visible scheduled command. It contains only durable
|
|
// configuration: every field is persisted to jobs.json. Transient execution
|
|
// state (last run, next run, command output, in-memory activity) lives in a
|
|
// separate JobRuntime so the jobs file stays a clean, hand-editable record of
|
|
// configuration and never mixes in process-lifetime bookkeeping.
|
|
type Job struct {
|
|
ID int `json:"id"`
|
|
Name string `json:"name"`
|
|
Folder string `json:"folder,omitempty"`
|
|
Schedule string `json:"schedule"`
|
|
Command string `json:"command"`
|
|
Arguments string `json:"arguments,omitempty"`
|
|
StartOnly bool `json:"start_only,omitempty"`
|
|
Enabled bool `json:"enabled"`
|
|
OverlapPolicy string `json:"overlap_policy,omitempty"`
|
|
// TimeoutSeconds bounds how long a run may take before it is killed. It is a
|
|
// pointer so the three states stay distinguishable on disk: absent (nil)
|
|
// means "inherit the global Config.DefaultTimeoutSeconds", mirroring
|
|
// OverlapPolicy's empty string; an explicit 0 means "no timeout" and does
|
|
// not inherit; a positive value is the per-job limit in seconds. The
|
|
// inherited global default may itself be 0, also meaning no timeout.
|
|
// normalizeJobs must leave nil untouched rather than backfilling a value.
|
|
TimeoutSeconds *int `json:"timeout_seconds,omitempty"`
|
|
}
|
|
|
|
// TimeoutSecondsPtr returns a pointer suitable for Job.TimeoutSeconds. It exists
|
|
// because nil (inherit) and an explicit 0 (no timeout) are different states, so
|
|
// callers cannot just assign an int.
|
|
func TimeoutSecondsPtr(seconds int) *int {
|
|
return &seconds
|
|
}
|