Commit ed3e738

authored

fix: Fix import issues of shell cronjob (1Panel-dev#9726)

1 parent bc376ec commit ed3e738Copy full SHA for ed3e738

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -276,29 +276,30 @@ func (u *CronjobService) Import(req []dto.CronjobTrans) error {`
`276`	`276`	`cronjob.DBName = strings.Join(dbIDs, ",")`
`277`	`277`	`case "shell":`
`278`	`278`	`if len(item.ContainerName) != 0 {`
	`279`	`+ cronjob.Script = item.Script`
`279`	`280`	`client, err := docker.NewDockerClient()`
`280`	`281`	`if err != nil {`
`281`	`282`	`hasNotFound = true`
`282`		`- continue`
	`283`	`+ break`
`283`	`284`	`}`
`284`	`285`	`defer client.Close()`
`285`	`286`	`if _, err := client.ContainerStats(context.Background(), item.ContainerName, false); err != nil {`
`286`	`287`	`hasNotFound = true`
`287`		`- continue`
	`288`	`+ break`
`288`	`289`	`}`
`289`	`290`	`}`
`290`	`291`	`switch item.ScriptMode {`
`291`	`292`	`case "library":`
`292`	`293`	`library, _ := scriptRepo.Get(repo.WithByName(item.ScriptName))`
`293`	`294`	`if library.ID == 0 {`
`294`	`295`	`hasNotFound = true`
`295`		`- continue`
	`296`	`+ break`
`296`	`297`	`}`
`297`	`298`	`cronjob.ScriptID = library.ID`
`298`	`299`	`case "select":`
`299`	`300`	`if _, err := os.Stat(item.Script); err != nil {`
`300`	`301`	`hasNotFound = true`
`301`		`- continue`
	`302`	`+ break`
`302`	`303`	`}`
`303`	`304`	`cronjob.Script = item.Script`
`304`	`305`	`case "input":`

Comments

(0)