Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-03 06:37:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Startup/shutdown commands run in background with &

Browse source
This commit is contained in:
Matthew Holt 2015-05-05 11:08:45 -06:00
parent 1e730a74a0
commit 9a78857b31
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
config/setup/startupshutdown.go
View file

@ -3,6 +3,7 @@ package setup
import ( import (
"os" "os"
"os/exec" "os/exec"
"strings"
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
) )
@ -20,11 +21,19 @@ func Shutdown(c *Controller) (middleware.Middleware, error) {
// to the list of callback functions passed in by reference. // to the list of callback functions passed in by reference.
func registerCallback(c *Controller, list *[]func() error) error { func registerCallback(c *Controller, list *[]func() error) error {
for c.Next() { for c.Next() {
if !c.NextArg() { args := c.RemainingArgs()
if len(args) == 0 {
return c.ArgErr() return c.ArgErr()
} }
command, args, err := middleware.SplitCommandAndArgs(c.Val()) nonblock := false
if len(args) > 1 && args[len(args)-1] == "&" {
// Run command in background; non-blocking
nonblock = true
args = args[:len(args)-1]
}
command, args, err := middleware.SplitCommandAndArgs(strings.Join(args, " "))
if err != nil { if err != nil {
return c.Err(err.Error()) return c.Err(err.Error())
} }
@ -33,7 +42,12 @@ func registerCallback(c *Controller, list *[]func() error) error {
cmd := exec.Command(command, args...) cmd := exec.Command(command, args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
return cmd.Run()
if nonblock {
return cmd.Start()
} else {
return cmd.Run()
}
} }
*list = append(*list, fn) *list = append(*list, fn)