0.2.66 - End Credits improvements / Gateway: 0.1.47 - End credits redesign
This commit is contained in:
@@ -51,15 +51,21 @@ type Task struct {
|
||||
// Status is one task as the console reads it: the declaration, the operator's overrides,
|
||||
// the last run and when the next one is due.
|
||||
type Status struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Group string `json:"group"`
|
||||
Interval int64 `json:"intervalSeconds"`
|
||||
Enabled bool `json:"enabled"`
|
||||
Running bool `json:"running"`
|
||||
NextRun *time.Time `json:"nextRun,omitempty"`
|
||||
LastRun *store.TaskRun `json:"lastRun,omitempty"`
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Group string `json:"group"`
|
||||
Interval int64 `json:"intervalSeconds"`
|
||||
// DefaultInterval is the cadence declared in code, which Interval hides whenever an
|
||||
// operator has overridden it. Both are sent because the console cannot otherwise tell
|
||||
// "every ten minutes because that is the default" from "every ten minutes because
|
||||
// somebody chose it" — and without that distinction its cadence control has no way to
|
||||
// offer a way back, or to say that a task is no longer running as shipped.
|
||||
DefaultInterval int64 `json:"defaultIntervalSeconds"`
|
||||
Enabled bool `json:"enabled"`
|
||||
Running bool `json:"running"`
|
||||
NextRun *time.Time `json:"nextRun,omitempty"`
|
||||
LastRun *store.TaskRun `json:"lastRun,omitempty"`
|
||||
}
|
||||
|
||||
type registered struct {
|
||||
@@ -458,8 +464,9 @@ func (s *Scheduler) Snapshot() []Status {
|
||||
status := Status{
|
||||
ID: entry.task.ID, Name: entry.task.Name,
|
||||
Description: entry.task.Description, Group: entry.task.Group,
|
||||
Interval: int64(entry.effectiveInterval() / time.Second),
|
||||
Enabled: entry.enabled, Running: entry.running,
|
||||
Interval: int64(entry.effectiveInterval() / time.Second),
|
||||
DefaultInterval: int64(entry.task.Interval / time.Second),
|
||||
Enabled: entry.enabled, Running: entry.running,
|
||||
}
|
||||
if !entry.nextRun.IsZero() && entry.enabled {
|
||||
next := entry.nextRun
|
||||
|
||||
Reference in New Issue
Block a user