mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-12-17 21:08:25 +08:00
Fix typo
This commit is contained in:
parent
f5568d4874
commit
45645a0313
1 changed files with 4 additions and 4 deletions
|
|
@ -31,7 +31,7 @@ type Task struct {
|
||||||
taskRepo repo.ITaskRepo
|
taskRepo repo.ITaskRepo
|
||||||
Task *model.Task
|
Task *model.Task
|
||||||
ParentID string
|
ParentID string
|
||||||
CancleWhenTimeout bool
|
CancelWhenTimeout bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type SubTask struct {
|
type SubTask struct {
|
||||||
|
|
@ -44,7 +44,7 @@ type SubTask struct {
|
||||||
Rollback RollbackFunc
|
Rollback RollbackFunc
|
||||||
Error error
|
Error error
|
||||||
IgnoreErr bool
|
IgnoreErr bool
|
||||||
CancleWhenTimeout bool
|
CancelWhenTimeout bool
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
@ -146,7 +146,7 @@ func (s *SubTask) Execute() error {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
s.RootTask.Log(i18n.GetWithName("TaskTimeout", subTaskName))
|
s.RootTask.Log(i18n.GetWithName("TaskTimeout", subTaskName))
|
||||||
if s.CancleWhenTimeout {
|
if s.CancelWhenTimeout {
|
||||||
return buserr.New(i18n.GetWithName("TaskTimeout", subTaskName))
|
return buserr.New(i18n.GetWithName("TaskTimeout", subTaskName))
|
||||||
}
|
}
|
||||||
case err = <-done:
|
case err = <-done:
|
||||||
|
|
@ -179,7 +179,7 @@ func (t *Task) Execute() error {
|
||||||
var err error
|
var err error
|
||||||
t.Log(i18n.GetWithName("TaskStart", t.Name))
|
t.Log(i18n.GetWithName("TaskStart", t.Name))
|
||||||
for _, subTask := range t.SubTasks {
|
for _, subTask := range t.SubTasks {
|
||||||
subTask.CancleWhenTimeout = t.CancleWhenTimeout
|
subTask.CancelWhenTimeout = t.CancelWhenTimeout
|
||||||
t.Task.CurrentStep = subTask.StepAlias
|
t.Task.CurrentStep = subTask.StepAlias
|
||||||
t.updateTask(t.Task)
|
t.updateTask(t.Task)
|
||||||
if err = subTask.Execute(); err == nil {
|
if err = subTask.Execute(); err == nil {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue