From 4c796203bd361462e82c227d2918b2827e20db37 Mon Sep 17 00:00:00 2001 From: MinatoHikari <35342316+MinatoHikari@users.noreply.github.com> Date: Thu, 12 May 2022 02:43:23 +0800 Subject: [PATCH] check process queue when catching error --- cmds.go | 4 ++-- config.go | 1 + main.go | 13 +++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cmds.go b/cmds.go index 939e1d5..873dee6 100644 --- a/cmds.go +++ b/cmds.go @@ -34,7 +34,7 @@ Loop: for scanner.Scan() { m := scanner.Text() fmt.Println(m) - if strings.Contains(m, "DONE") { + if strings.Contains(m, "exit status") { if err := c.Process.Release(); err != nil { panic(err) } @@ -80,7 +80,7 @@ func RunBuild(logger *golog.Logger, script string) error { str = script if script == "" { - str = "build:dev" + str = "build" } npmRunBuild := exec.Command("npm", "run", str) diff --git a/config.go b/config.go index 6aafc5b..59ff2cf 100644 --- a/config.go +++ b/config.go @@ -56,6 +56,7 @@ func GetToken() *string { return &token } +// GetPort 获取服务运行的端口 func GetPort() string { port := Config.GetString("port") if port != "" { diff --git a/main.go b/main.go index ccef782..a6aa399 100644 --- a/main.go +++ b/main.go @@ -121,6 +121,8 @@ func RunDeployProcess(logger *golog.Logger, path string, script string, dist str <-Queue + Checkqueue(logger, path, script, dist) + return } @@ -131,6 +133,8 @@ func RunDeployProcess(logger *golog.Logger, path string, script string, dist str <-Queue + Checkqueue(logger, path, script, dist) + return } @@ -141,6 +145,8 @@ func RunDeployProcess(logger *golog.Logger, path string, script string, dist str <-Queue + Checkqueue(logger, path, script, dist) + return } @@ -151,6 +157,8 @@ func RunDeployProcess(logger *golog.Logger, path string, script string, dist str <-Queue + Checkqueue(logger, path, script, dist) + return } @@ -158,6 +166,11 @@ func RunDeployProcess(logger *golog.Logger, path string, script string, dist str <-Queue + Checkqueue(logger, path, script, dist) +} + +// Checkqueue check if there are other processes exist +func Checkqueue(logger *golog.Logger, path string, script string, dist string) { if len(Processes) != 0 { Queue <- 1