fix: 使用完整路径执行 sudo 和 systemctl 命令
问题原因: - systemd 服务的 PATH 环境变量可能受限 - 直接使用 "sudo" 可能找不到可执行文件 修复内容: - 添加 findExecutable 函数动态查找可执行文件路径 - 先尝试 exec.LookPath,再检查常见系统路径 - 添加日志显示实际使用的路径,方便调试 - 兼容不同 Linux 发行版的路径差异
This commit is contained in:
@@ -3,12 +3,39 @@ package sysutil
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"runtime"
|
"runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
const serviceName = "sub2api"
|
const serviceName = "sub2api"
|
||||||
|
|
||||||
|
// findExecutable finds the full path of an executable
|
||||||
|
// by checking common system paths
|
||||||
|
func findExecutable(name string) string {
|
||||||
|
// First try exec.LookPath (uses current PATH)
|
||||||
|
if path, err := exec.LookPath(name); err == nil {
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: check common paths
|
||||||
|
commonPaths := []string{
|
||||||
|
"/usr/bin/" + name,
|
||||||
|
"/bin/" + name,
|
||||||
|
"/usr/sbin/" + name,
|
||||||
|
"/sbin/" + name,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, path := range commonPaths {
|
||||||
|
if _, err := os.Stat(path); err == nil {
|
||||||
|
return path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the name as-is and let exec fail with a clear error
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
|
||||||
// RestartService triggers a service restart via systemd.
|
// RestartService triggers a service restart via systemd.
|
||||||
//
|
//
|
||||||
// IMPORTANT: This function initiates the restart and returns immediately.
|
// IMPORTANT: This function initiates the restart and returns immediately.
|
||||||
@@ -30,10 +57,17 @@ func RestartService() error {
|
|||||||
|
|
||||||
log.Println("Initiating service restart...")
|
log.Println("Initiating service restart...")
|
||||||
|
|
||||||
|
// Find full paths for sudo and systemctl
|
||||||
|
// This ensures the commands work even if PATH is limited in systemd service
|
||||||
|
sudoPath := findExecutable("sudo")
|
||||||
|
systemctlPath := findExecutable("systemctl")
|
||||||
|
|
||||||
|
log.Printf("Using sudo: %s, systemctl: %s", sudoPath, systemctlPath)
|
||||||
|
|
||||||
// The sub2api user has NOPASSWD sudo access for systemctl commands
|
// The sub2api user has NOPASSWD sudo access for systemctl commands
|
||||||
// (configured by install.sh in /etc/sudoers.d/sub2api).
|
// (configured by install.sh in /etc/sudoers.d/sub2api).
|
||||||
// Use -n (non-interactive) to prevent sudo from waiting for password input
|
// Use -n (non-interactive) to prevent sudo from waiting for password input
|
||||||
cmd := exec.Command("sudo", "-n", "systemctl", "restart", serviceName)
|
cmd := exec.Command(sudoPath, "-n", systemctlPath, "restart", serviceName)
|
||||||
if err := cmd.Start(); err != nil {
|
if err := cmd.Start(); err != nil {
|
||||||
return fmt.Errorf("failed to initiate service restart: %w", err)
|
return fmt.Errorf("failed to initiate service restart: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user