Merge pull request #21 from mindon/master

variable is always bounded to the first request #20

command.go

@@ -17,7 +17,8 @@ type Cmd struct {
 	Command string `json:"command,omitempty"`
 
 	// The command args.
-	Args []string `json:"args,omitempty"`
+	Args []string
+	Argv []string `json:"args,omitempty"`
 
 	// The directory to run the command from.
 	// Defaults to current directory.

middleware.go

@@ -42,9 +42,11 @@ func (m Middleware) Validate() error { return m.Cmd.validate() }
 func (m Middleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
 	repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
 
+	argv := make([]string, len(m.Args))
 	for index, argument := range m.Args {
-		m.Args[index] = repl.ReplaceAll(argument, "")
+		argv[index] = repl.ReplaceAll(argument, "")
 	}
+	m.Argv = argv
 
 	err := m.run()
 
@@ -75,5 +77,6 @@ func (m Middleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy
 // Cleanup implements caddy.Cleanup
 // TODO: ensure all running processes are terminated.
 func (m *Middleware) Cleanup() error {
+	m.Argv = nil
 	return nil
 }

run.go

@@ -18,11 +18,11 @@ type runnerFunc func() error
 func (r runnerFunc) Run() error { return r() }
 
 func (c *Cmd) run() error {
-	cmdInfo := zap.Any("command", append([]string{c.Command}, c.Args...))
+	cmdInfo := zap.Any("command", append([]string{c.Command}, c.Argv...))
 	log := c.log.With(cmdInfo)
 	startTime := time.Now()
 
-	cmd := exec.Command(c.Command, c.Args...)
+	cmd := exec.Command(c.Command, c.Argv...)
 
 	done := make(chan struct{}, 1)
 
@@ -36,7 +36,7 @@ func (c *Cmd) run() error {
 			cancel()
 		}()
 
-		cmd = exec.CommandContext(ctx, c.Command, c.Args...)
+		cmd = exec.CommandContext(ctx, c.Command, c.Argv...)
 	}
 
 	// configure command