git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-21 17:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improve environment variable handling in task runner

Browse Source 
- Replaced direct manipulation of r.cmd.Env with os.Setenv for setting PYENV_ROOT, PATH, NODE_PATH, and GOPATH, enhancing error handling and clarity.
- Ensured proper initialization of default environment variables in the configureEnv method, maintaining organization and readability in the environment setup process.
This commit is contained in:
Marvin Zhang
2025-04-15 23:11:53 +08:00
parent 7e3378c7ef
commit 94194445d8
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/task/handler/runner.go
View File

@@ -351,7 +351,10 @@ func (r *Runner) configurePythonPath() {
pyenvBinPath := pyenvRoot + "/bin"
// Configure global pyenv path
r.cmd.Env = append(r.cmd.Env, "PYENV_ROOT="+pyenvRoot)
err := os.Setenv("PYENV_ROOT", pyenvRoot)
if err != nil {
r.Errorf("error setting PYENV_ROOT environment variable: %v", err)
}
if !strings.Contains(envPath, pyenvShimsPath) {
envPath = pyenvShimsPath + ":" + envPath
}
@@ -360,7 +363,10 @@ func (r *Runner) configurePythonPath() {
}
// Update PATH environment variable
r.cmd.Env = append(r.cmd.Env, "PATH="+envPath)
err = os.Setenv("PATH", envPath)
if err != nil {
r.Errorf("error setting PATH environment variable: %v", err)
}
}
// configureNodePath sets up the Node.js environment paths, handling both nvm and default installations
@@ -373,7 +379,10 @@ func (r *Runner) configureNodePath() {
if !strings.Contains(envPath, nodePath) {
envPath = nodePath + ":" + envPath
}
r.cmd.Env = append(r.cmd.Env, "NODE_PATH="+nodePath)
err := os.Setenv("NODE_PATH", nodePath)
if err != nil {
r.Errorf("error setting NODE_PATH environment variable: %v", err)
}
// Configure global node_bin path
nodeBinPath := utils.GetNodeBinPath()
@@ -382,14 +391,20 @@ func (r *Runner) configureNodePath() {
}
// Update PATH environment variable
r.cmd.Env = append(r.cmd.Env, "PATH="+envPath)
err = os.Setenv("PATH", envPath)
if err != nil {
r.Errorf("error setting PATH environment variable: %v", err)
}
}
func (r *Runner) configureGoPath() {
// Configure global go path
goPath := utils.GetGoPath()
if goPath != "" {
r.cmd.Env = append(r.cmd.Env, "GOPATH="+goPath)
err := os.Setenv("GOPATH", goPath)
if err != nil {
r.Errorf("error setting GOPATH environment variable: %v", err)
}
}
}
@@ -398,10 +413,6 @@ func (r *Runner) configureGoPath() {
// - Crawlab-specific variables
// - Global environment variables from the system
func (r *Runner) configureEnv() {
// Default envs
r.cmd.Env = os.Environ()
r.cmd.Env = append(r.cmd.Env, "CRAWLAB_TASK_ID="+r.tid.Hex())
// Configure Python path
r.configurePythonPath()
@@ -411,6 +422,10 @@ func (r *Runner) configureEnv() {
// Configure Go path
r.configureGoPath()
// Default envs
r.cmd.Env = os.Environ()
r.cmd.Env = append(r.cmd.Env, "CRAWLAB_TASK_ID="+r.tid.Hex())
// Global environment variables
envs, err := client.NewModelService[models.Environment]().GetMany(nil, nil)
if err != nil {