admin/TaskPool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: history page support sharedworker.js

Browse Source
This commit is contained in:
duorameng
2026-05-09 08:42:15 +08:00
parent 95a7de599e
commit 9c174d8db2
10 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/services/repo/repo_parser.go
+2 -2
View File
@@ -134,9 +134,9 @@ func ParseRepoScriptsAndAddCron(taskID string, logWriter io.Writer, forceComment
displayPath = filepath.Base(path)
relDir, _ := filepath.Rel(absScriptsDir, filepath.Dir(absPath))
if relDir == "." {
displayWorkDir = "$SCRIPTS_DIR$"
displayWorkDir = constant.ScriptsDirPlaceholder
} else {
displayWorkDir = filepath.ToSlash(filepath.Join("$SCRIPTS_DIR$", relDir))
displayWorkDir = filepath.ToSlash(filepath.Join(constant.ScriptsDirPlaceholder, relDir))
}
}
internal/services/tasks/executor_service.go
+5 -3
View File
@@ -291,6 +291,7 @@ func (h *ServerSchedulerHandler) OnTaskCompleted(req *executor.ExecutionRequest,
eventbus.DefaultBus.Publish(eventbus.Event{
Type: eventType,
Payload: map[string]interface{}{
"log_id": req.LogID,
"task_id": task.ID,
"task_name": task.Name,
"status": result.Status,
@@ -372,6 +373,7 @@ func (h *ServerSchedulerHandler) OnTaskFailed(req *executor.ExecutionRequest, er
eventbus.DefaultBus.Publish(eventbus.Event{
Type: constant.EventTaskFailed,
Payload: map[string]interface{}{
"log_id": req.LogID,
"task_id": taskID,
"task_name": taskName,
"error": err.Error(),
@@ -1099,9 +1101,9 @@ func BuildRepoCommand(task *models.Task) (string, string) {
displayTargetPath := absTargetPath
if rel, err := filepath.Rel(scriptsDir, absTargetPath); err == nil && !strings.HasPrefix(rel, "..") {
if rel == "." {
displayTargetPath = "$SCRIPTS_DIR$"
displayTargetPath = constant.ScriptsDirPlaceholder
} else {
displayTargetPath = "$SCRIPTS_DIR$/" + filepath.ToSlash(rel)
displayTargetPath = constant.ScriptsDirPlaceholder + "/" + filepath.ToSlash(rel)
}
}
@@ -1233,7 +1235,7 @@ func (es *ExecutorService) refreshExecutionRequestEnvs(req *executor.ExecutionRe
func (es *ExecutorService) ResolvePath(path string) string {
absScriptsDir := resolveAbsScriptsDir()
return strings.ReplaceAll(path, "$SCRIPTS_DIR$", absScriptsDir)
return strings.ReplaceAll(path, constant.ScriptsDirPlaceholder, absScriptsDir)
}
func buildRepoCommandEnvPrefix() string {