解决caddy重载可能出现卡死的问题

application/library/caddy/caddy.go

@@ -20,6 +20,7 @@ package caddy
 
 import (
 	"bufio"
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -54,6 +55,7 @@ var (
 		PidFile:                 `./caddy.pid`,
 	}
 	DefaultVersion = `2.0.0`
+	EnableReload   = true
 )
 
 func TrapSignals() {
@@ -97,6 +99,7 @@ func Fixed(c *Config) {
 	c.appName = `nging`
 	c.appVersion = echo.String(`VERSION`, DefaultVersion)
 	c.Agreed = true
+	c.ctx, c.cancel = context.WithCancel(context.Background())
 }
 
 type Config struct {
@@ -124,6 +127,12 @@ type Config struct {
 	appName    string
 	instance   *caddy.Instance
 	stopped    bool
+	ctx        context.Context
+	cancel     context.CancelFunc
+}
+
+func now() string {
+	return time.Now().Format(`2006-01-02 15:04:05`)
 }
 
 func (c *Config) Start() error {
@@ -140,36 +149,58 @@ func (c *Config) Start() error {
 	if err != nil {
 		return err
 	}
+
+	if EnableReload {
+		c.watchingSignal()
+	}
+
 	// Start your engines
 	c.instance, err = caddy.Start(caddyfile)
 	if err != nil {
 		return err
 	}
 
-	// Execute instantiation events
-	caddy.EmitEvent(caddy.InstanceStartupEvent, c.instance)
+	msgbox.Success(`Caddy`, `Server has been successfully started at `+now())
 
-	// Listen to keypress of "return" and restart the app automatically
+	// Twiddle your thumbs
+	c.instance.Wait()
+	return nil
+}
+
+// Listen to keypress of "return" and restart the app automatically
+func (c *Config) watchingSignal() {
+	debug := false
 	go func() {
+		if debug {
+			msgbox.Info(`Caddy`, `listen return ==> `+now())
+		}
 		in := bufio.NewReader(os.Stdin)
 		for {
-			input, _ := in.ReadString('\n')
-			if input == "\n" || input == "\r\n" {
-				c.Restart()
-			}
-			if c.stopped {
-				break
+			select {
+			case <-c.ctx.Done():
+				return
+			default:
+				if debug {
+					msgbox.Info(`Caddy`, `reading ==> `+now())
+				}
+				input, _ := in.ReadString(com.LF)
+				if input == com.StrLF || input == com.StrCRLF {
+					if debug {
+						msgbox.Info(`Caddy`, `restart ==> `+now())
+					}
+					c.Restart()
+				} else {
+					if debug {
+						msgbox.Info(`Caddy`, `waiting ==> `+now())
+					}
+				}
 			}
 		}
 	}()
-
-	// Twiddle your thumbs
-	c.instance.Wait()
-	return nil
 }
 
 func (c *Config) Restart() error {
-	msgbox.Info(`Information`, `Caddy Server has been successfully reloaded at `+time.Now().Format(`2006-01-02 15:04:05`))
+	defer msgbox.Success(`Caddy`, `Server has been successfully reloaded at `+now())
 	if c.instance == nil {
 		return nil
 	}
@@ -187,6 +218,10 @@ func (c *Config) Restart() error {
 
 func (c *Config) Stop() error {
 	c.stopped = true
+	defer func() {
+		c.cancel()
+		msgbox.Success(`Caddy`, `Server has been successfully stopped at `+now())
+	}()
 	if c.instance == nil {
 		return nil
 	}

application/library/config/cliconfig.go

@@ -213,7 +213,11 @@ func (c *CLIConfig) CmdSendSignal(typeName string, sig os.Signal) error {
 	if cmd.Process == nil {
 		return nil
 	}
-	return cmd.Process.Signal(sig)
+	err := cmd.Process.Signal(sig)
+	if err != nil && (cmd.ProcessState == nil || cmd.ProcessState.Exited()) {
+		err = nil
+	}
+	return err
 }
 
 func (c *CLIConfig) Kill(cmd *exec.Cmd) error {

application/library/config/cliconfig_caddy.go

@@ -23,6 +23,7 @@ import (
 	"os"
 
 	"github.com/admpub/log"
+	"github.com/admpub/nging/application/library/caddy"
 	"github.com/webx-top/com"
 )
 
@@ -39,8 +40,12 @@ func (c *CLIConfig) CaddyStart(writer ...io.Writer) (err error) {
 		log.Error(err.Error())
 	}
 	params := []string{os.Args[0], `--config`, c.Conf, `--type`, `webserver`}
-	c.caddyCh = com.NewCmdChanReader()
-	c.cmds["caddy"] = com.RunCmdWithReaderWriter(params, c.caddyCh, writer...)
+	if caddy.EnableReload {
+		c.caddyCh = com.NewCmdChanReader()
+		c.cmds["caddy"] = com.RunCmdWithReaderWriter(params, c.caddyCh, writer...)
+	} else {
+		c.cmds["caddy"] = com.RunCmdWithWriter(params, writer...)
+	}
 	return nil
 }
 
@@ -54,14 +59,13 @@ func (c *CLIConfig) CaddyStop() error {
 	return c.CmdStop("caddy")
 }
 
-var eol = []byte("\n")
-
 func (c *CLIConfig) CaddyReload() error {
 	if c.caddyCh == nil || com.IsWindows { //windows不支持重载，需要重启
 		return c.CaddyRestart()
 	}
-	c.caddyCh.Send(eol)
+	c.caddyCh.Send(com.BreakLine)
 	return nil
+	//c.CmdSendSignal("caddy", os.Interrupt)
 }
 
 func (c *CLIConfig) CaddyRestart(writer ...io.Writer) error {

application/library/msgbox/msgbox.go

@@ -20,9 +20,11 @@ package msgbox
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"strings"
 
+	isatty "github.com/admpub/go-isatty"
 	"github.com/admpub/go-pretty/table"
 	"github.com/admpub/go-pretty/text"
 )
@@ -47,14 +49,34 @@ func Debug(title, content string, args ...interface{}) {
 	Render(title, content, `debug`, args...)
 }
 
+func Colorable(w io.Writer) bool {
+	file, ok := w.(*os.File)
+	if !ok {
+		return false
+	}
+	if isatty.IsTerminal(file.Fd()) {
+		return true
+	}
+	if isatty.IsCygwinTerminal(file.Fd()) {
+		return true
+	}
+	return false
+}
+
+var StdoutColorable = Colorable(os.Stdout)
+
 func Render(title, content, typ string, args ...interface{}) {
+	if len(args) > 0 {
+		content = fmt.Sprintf(content, args...)
+	}
+	if !StdoutColorable {
+		os.Stdout.WriteString(`[` + strings.ToUpper(typ) + `][` + title + `] ` + content + "\n")
+		return
+	}
 	t := table.NewWriter()
 	t.SetOutputMirror(os.Stdout)
 	t.AppendHeader(table.Row{title})
 	t.AppendRow([]interface{}{""})
-	if len(args) > 0 {
-		content = fmt.Sprintf(content, args...)
-	}
 	for _, row := range strings.Split(content, "\n") {
 		t.AppendRow([]interface{}{row})
 	}