🐛修复一个bug
All checks were successful
continuous-integration/drone/tag Build is passing

This commit is contained in:
coward 2024-06-05 11:40:34 +08:00
parent 1e8e1c0196
commit 207e568099
2 changed files with 14 additions and 7 deletions

View File

@ -3,6 +3,7 @@ package command
import (
"fmt"
"gitee.ltd/lxh/logger/log"
"os"
"os/exec"
"strings"
"wireguard-dashboard/repository"
@ -47,8 +48,13 @@ func RestartWireguard(isAsync bool) {
func StopWireguard() {
configFileName := getConfigFileName()
if err := exec.Command("/bin/sh", "-c", fmt.Sprintf("wg-quick down %s", configFileName)).Run(); err != nil {
cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf("wg-quick down %s", configFileName))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
log.Errorf("停止wireguard[%s]服务端失败: %v", configFileName, err.Error())
} else {
log.Infof("停止wireguard[%s]服务端成功", configFileName)
}
return
@ -59,9 +65,13 @@ func StopWireguard() {
func StartWireguard() {
configFileName := getConfigFileName()
if err := exec.Command("/bin/sh", "-c", fmt.Sprintf("wg-quick up %s", configFileName)).Run(); err != nil {
cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf("wg-quick up %s", configFileName))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
log.Errorf("启动wireguard[%s]服务端失败: %v", configFileName, err.Error())
} else {
log.Infof("启动wireguard[%s]服务端成功", configFileName)
}
return
}

View File

@ -36,9 +36,6 @@ func (w wireguard) Apply(templateFilePath, configFilePath string, data any) (err
switch config.Config.Wireguard.ListenConfig {
case "auto":
w.watchListConfig(configFilePath)
case "hand": // 手动操作
command.RestartWireguard(true)
}
return nil
@ -72,7 +69,7 @@ func (wireguard) watchListConfig(filePath string) {
}
// 打印监听事件
log.Errorf("监听事件是:%s", event.String())
log.Infof("监听事件是:%s", event.String())
case _, ok := <-watcher.Errors:
if !ok {
return