Skip to content

Commit 04933e6

Browse files
committed
重置配置的同时也重置本地API节点的配置
1 parent 12abe9a commit 04933e6

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

cmd/edge-admin/main.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"bytes"
45
"fmt"
56
"github.com/TeaOSLab/EdgeAdmin/internal/apps"
67
"github.com/TeaOSLab/EdgeAdmin/internal/configs"
@@ -9,10 +10,13 @@ import (
910
"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
1011
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
1112
_ "github.com/TeaOSLab/EdgeAdmin/internal/web"
13+
"github.com/iwind/TeaGo/Tea"
1214
_ "github.com/iwind/TeaGo/bootstrap"
1315
"github.com/iwind/TeaGo/maps"
1416
"github.com/iwind/gosock/pkg/gosock"
1517
"log"
18+
"os"
19+
"os/exec"
1620
"time"
1721
)
1822

@@ -53,6 +57,20 @@ func main() {
5357
fmt.Println("[ERROR]reset failed: " + err.Error())
5458
return
5559
}
60+
61+
// reset local api
62+
var apiNodeExe = Tea.Root + "/edge-api/bin/edge-api"
63+
_, err = os.Stat(apiNodeExe)
64+
if err == nil {
65+
var cmd = exec.Command(apiNodeExe, "reset")
66+
var stderr = &bytes.Buffer{}
67+
cmd.Stderr = stderr
68+
err = cmd.Run()
69+
if err != nil {
70+
fmt.Println("reset api node failed: " + stderr.String())
71+
}
72+
}
73+
5674
fmt.Println("done")
5775
})
5876
app.On("recover", func() {

internal/configs/api_config.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ func LoadAPIConfig() (*APIConfig, error) {
6161

6262
// ResetAPIConfig 重置配置
6363
func ResetAPIConfig() error {
64-
filename := "api.yaml"
64+
var filename = "api.yaml"
6565

66+
// 重置 configs/api.yaml
6667
{
67-
configFile := Tea.ConfigFile(filename)
68+
var configFile = Tea.ConfigFile(filename)
6869
stat, err := os.Stat(configFile)
6970
if err == nil && !stat.IsDir() {
7071
err = os.Remove(configFile)
@@ -77,7 +78,7 @@ func ResetAPIConfig() error {
7778
// 重置 ~/.edge-admin/api.yaml
7879
homeDir, homeErr := os.UserHomeDir()
7980
if homeErr == nil {
80-
configFile := homeDir + "/." + teaconst.ProcessName + "/" + filename
81+
var configFile = homeDir + "/." + teaconst.ProcessName + "/" + filename
8182
stat, err := os.Stat(configFile)
8283
if err == nil && !stat.IsDir() {
8384
err = os.Remove(configFile)
@@ -89,7 +90,7 @@ func ResetAPIConfig() error {
8990

9091
// 重置 /etc/edge-admin/api.yaml
9192
{
92-
configFile := "/etc/" + teaconst.ProcessName + "/" + filename
93+
var configFile = "/etc/" + teaconst.ProcessName + "/" + filename
9394
stat, err := os.Stat(configFile)
9495
if err == nil && !stat.IsDir() {
9596
err = os.Remove(configFile)

0 commit comments

Comments
 (0)