feat: 优化服务状态显示

pkg/systemctl/service.go

@@ -1,8 +1,6 @@
 package systemctl
 
 import (
-	"errors"
-	"fmt"
 	"time"
 
 	"github.com/tnb-labs/panel/pkg/shell"
@@ -10,84 +8,79 @@ import (
 
 // Status 获取服务状态
 func Status(name string) (bool, error) {
-	output, err := shell.Execf("systemctl status %s | grep Active | grep -v grep | awk '{print $2}'", name)
-	return output == "active", err
+	output, _ := shell.Execf("systemctl is-active '%s'", name) // 不判断错误，因为 is-active 在服务未启用时会返回 3
+	return output == "active", nil
 }
 
 // IsEnabled 服务是否启用
 func IsEnabled(name string) (bool, error) {
-	out, err := shell.Execf("systemctl is-enabled '%s'", name)
-	if err != nil {
-		return false, fmt.Errorf("failed to check service status: %w", err)
-	}
-
-	switch out {
-	case "enabled":
-		return true, nil
-	case "disabled":
-		return false, nil
-	case "masked":
-		return false, errors.New("service is masked")
-	case "static":
-		return false, errors.New("service is statically enabled")
-	case "indirect":
-		return false, errors.New("service is indirectly enabled")
-	default:
-		return false, errors.New("unknown service status")
-	}
+	out, _ := shell.Execf("systemctl is-enabled '%s'", name) // 不判断错误，因为 is-enabled 在服务禁用时会返回 1
+	return out == "enabled" || out == "static" || out == "indirect", nil
 }
 
 // Start 启动服务
 func Start(name string) error {
-	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl start %s", name)
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl start '%s'", name)
 	return err
 }
 
 // Stop 停止服务
 func Stop(name string) error {
-	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl stop %s", name)
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl stop '%s'", name)
 	return err
 }
 
 // Restart 重启服务
 func Restart(name string) error {
-	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl restart %s", name)
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl restart '%s'", name)
 	return err
 }
 
 // Reload 重载服务
 func Reload(name string) error {
-	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl reload %s", name)
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl reload '%s'", name)
 	return err
 }
 
 // Enable 启用服务
 func Enable(name string) error {
-	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl enable %s", name)
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl enable '%s'", name)
 	return err
 }
 
 // Disable 禁用服务
 func Disable(name string) error {
-	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl disable %s", name)
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl disable '%s'", name)
 	return err
 }
 
-// Logs 获取服务日志
-func Logs(name string) (string, error) {
-	return shell.ExecfWithTimeout(2*time.Minute, "journalctl -u %s", name)
+// Mask 屏蔽服务
+func Mask(name string) error {
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl mask '%s'", name)
+	return err
 }
 
-// LogsTail 获取服务日志
-func LogsTail(name string, lines int) (string, error) {
-	return shell.ExecfWithTimeout(2*time.Minute, "journalctl -u %s --lines %d", name, lines)
+// Unmask 解除屏蔽服务
+func Unmask(name string) error {
+	_, err := shell.ExecfWithTimeout(2*time.Minute, "systemctl unmask '%s'", name)
+	return err
 }
 
-// LogsClear 清空服务日志
-func LogsClear(name string) error {
-	if _, err := shell.Execf("journalctl --rotate -u %s", name); err != nil {
+// Log 获取服务日志
+func Log(name string) (string, error) {
+	return shell.ExecfWithTimeout(2*time.Minute, "journalctl -u '%s'", name)
+}
+
+// LogTail 获取服务日志
+func LogTail(name string, lines int) (string, error) {
+	return shell.ExecfWithTimeout(2*time.Minute, "journalctl -u '%s' --lines '%d'", name, lines)
+}
+
+// LogClear 清空服务日志
+func LogClear(name string) error {
+	if _, err := shell.Execf("journalctl --rotate -u '%s'", name); err != nil {
 		return err
 	}
-	_, err := shell.Execf("journalctl --vacuum-time=1s -u %s", name)
+	_, err := shell.Execf("journalctl --vacuum-time=1s -u '%s'", name)
 	return err
 }