drsybren/Flamenco
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Change sleep 'time_in_seconds' to 'duration_in_seconds'

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-02-14 14:54:03 +01:00
parent 8af041fe44
commit f5254c1c65
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/worker/command_executor.go
View File

@ -102,9 +102,9 @@ func (ce *CommandExecutor) cmdEcho(ctx context.Context, logger zerolog.Logger, t
// cmdSleep executes the "sleep" command.
func (ce *CommandExecutor) cmdSleep(ctx context.Context, logger zerolog.Logger, taskID TaskID, cmd api.Command) error {
sleepTime, ok := cmd.Settings["time_in_seconds"]
sleepTime, ok := cmd.Settings["duration_in_seconds"]
if !ok {
return errors.New("missing setting 'time_in_seconds'")
return errors.New("missing setting 'duration_in_seconds'")
}
var duration time.Duration
@ -112,8 +112,8 @@ func (ce *CommandExecutor) cmdSleep(ctx context.Context, logger zerolog.Logger,
case int:
duration = time.Duration(v) * time.Second
default:
log.Warn().Interface("time_in_seconds", v).Msg("bad type for setting 'time_in_seconds', expected int")
return fmt.Errorf("bad type for setting 'time_in_seconds', expected int, not %v", v)
log.Warn().Interface("duration_in_seconds", v).Msg("bad type for setting 'duration_in_seconds', expected int")
return fmt.Errorf("bad type for setting 'duration_in_seconds', expected int, not %v", v)
}
log.Info().Str("duration", duration.String()).Msg("sleep")

2
internal/worker/command_executor_test.go
View File

@ -94,7 +94,7 @@ func TestCommandSleep(t *testing.T) {
taskID := TaskID("90e9d656-e201-4ef0-b6b0-c80684fafa27")
cmd := api.Command{
Name: "sleep",
Settings: map[string]interface{}{"time_in_seconds": 47},
Settings: map[string]interface{}{"duration_in_seconds": 47},
}
timeBefore := clock.Now()