feat: supervisor plugin and optimize code

tnb-labs · Jul 25, 2023 · 65a4679 · 65a4679
1 parent b4720a1
commit 65a4679
Show file tree

Hide file tree

Showing 11 changed files with 1,063 additions and 6 deletions.
diff --git a/app/http/controllers/plugins/php74/php74_controller.go b/app/http/controllers/plugins/php74/php74_controller.go
@@ -35,8 +35,7 @@ func (c *Php74Controller) Status(ctx http.Context) {
 		return
 	}
 
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
-	status := strings.TrimSpace(out)
+	status := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
 		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 		return

diff --git a/app/http/controllers/plugins/php80/php80_controller.go b/app/http/controllers/plugins/php80/php80_controller.go
@@ -35,8 +35,7 @@ func (c *Php80Controller) Status(ctx http.Context) {
 		return
 	}
 
-	out := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
-	status := strings.TrimSpace(out)
+	status := tools.ExecShell("systemctl status php-fpm-" + c.version + " | grep Active | grep -v grep | awk '{print $2}'")
 	if len(status) == 0 {
 		controllers.Error(ctx, http.StatusInternalServerError, "获取PHP-"+c.version+"运行状态失败")
 		return