add some params data to context and fix lock job parsing

arriven · Jul 31, 2022 · e571bc9 · e571bc9
1 parent a5d2a2b
commit e571bc9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/job/runner.go b/src/job/runner.go
@@ -27,6 +27,7 @@ import (
 	"context"
 	"flag"
 	"math/rand"
+	"runtime"
 	"strings"
 	"time"
 
@@ -196,6 +197,10 @@ func (r *Runner) runJobs(ctx context.Context, cfg *config.MultiConfig, metric *m
 		}
 
 		ctx := context.WithValue(ctx, templates.ContextKey("config"), cfgMap)
+		ctx = context.WithValue(ctx, templates.ContextKey("global_config"), r.globalJobsCfg)
+		ctx = context.WithValue(ctx, templates.ContextKey("goos"), runtime.GOOS)
+		ctx = context.WithValue(ctx, templates.ContextKey("goarch"), runtime.GOARCH)
+		ctx = context.WithValue(ctx, templates.ContextKey("metrics"), metric)
 
 		for j := 0; j < cfg.Jobs[i].Count; j++ {
 			if cfg.Jobs[i].Name != "" {

diff --git a/src/job/utils.go b/src/job/utils.go
@@ -203,11 +203,11 @@ func lockJob(ctx context.Context, args config.Args, globalConfig *GlobalConfig,
 		Job config.Config
 	}
 
-	if err := mapstructure.Decode(templates.ParseAndExecuteMapStruct(logger, args, ctx), &jobConfig); err != nil {
+	if err := ParseConfig(&jobConfig, args, *globalConfig); err != nil {
 		return nil, fmt.Errorf("error parsing job config: %w", err)
 	}
 
-	unlock := locker.Lock(jobConfig.Key)
+	unlock := locker.Lock(templates.ParseAndExecute(logger, jobConfig.Key, ctx))
 	defer unlock()
 
 	job := Get(jobConfig.Job.Type)