mirror of
https://github.com/wyx2685/V2bX.git
synced 2026-02-06 05:30:08 +00:00
Compare commits
2 Commits
v0.0.0-202
...
v0.0.0-202
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41b7cf8eb9 | ||
|
|
330f3b1449 |
@@ -128,7 +128,7 @@ func (c *Client) GetNodeInfo() (node *NodeInfo, err error) {
|
|||||||
SetHeader("If-None-Match", c.nodeEtag).
|
SetHeader("If-None-Match", c.nodeEtag).
|
||||||
Get(path)
|
Get(path)
|
||||||
if err = c.checkResponse(r, path, err); err != nil {
|
if err = c.checkResponse(r, path, err); err != nil {
|
||||||
return
|
return nil, err
|
||||||
}
|
}
|
||||||
if r.StatusCode() == 304 {
|
if r.StatusCode() == 304 {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
@@ -238,9 +238,7 @@ func (c *Client) GetNodeInfo() (node *NodeInfo, err error) {
|
|||||||
}
|
}
|
||||||
case "dns":
|
case "dns":
|
||||||
var domains []string
|
var domains []string
|
||||||
for _, v := range matchs {
|
domains = append(domains, matchs...)
|
||||||
domains = append(domains, v)
|
|
||||||
}
|
|
||||||
if matchs[0] != "main" {
|
if matchs[0] != "main" {
|
||||||
node.RawDNS.DNSMap[strconv.Itoa(i)] = map[string]interface{}{
|
node.RawDNS.DNSMap[strconv.Itoa(i)] = map[string]interface{}{
|
||||||
"address": cm.Routes[i].ActionValue,
|
"address": cm.Routes[i].ActionValue,
|
||||||
@@ -249,7 +247,6 @@ func (c *Client) GetNodeInfo() (node *NodeInfo, err error) {
|
|||||||
} else {
|
} else {
|
||||||
dns := []byte(strings.Join(matchs[1:], ""))
|
dns := []byte(strings.Join(matchs[1:], ""))
|
||||||
node.RawDNS.DNSJson = dns
|
node.RawDNS.DNSJson = dns
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"runtime"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
"github.com/InazumaV/V2bX/conf"
|
"github.com/InazumaV/V2bX/conf"
|
||||||
vCore "github.com/InazumaV/V2bX/core"
|
vCore "github.com/InazumaV/V2bX/core"
|
||||||
"github.com/InazumaV/V2bX/limiter"
|
"github.com/InazumaV/V2bX/limiter"
|
||||||
@@ -8,10 +13,6 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"gopkg.in/natefinch/lumberjack.v2"
|
"gopkg.in/natefinch/lumberjack.v2"
|
||||||
"os"
|
|
||||||
"os/signal"
|
|
||||||
"runtime"
|
|
||||||
"syscall"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -95,6 +96,7 @@ func serverHandle(_ *cobra.Command, _ []string) {
|
|||||||
log.WithField("err", err).Error("Restart node failed")
|
log.WithField("err", err).Error("Restart node failed")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
runtime.GC()
|
||||||
vc, err = vCore.NewCore(c.CoresConfig)
|
vc, err = vCore.NewCore(c.CoresConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithField("err", err).Error("New core failed")
|
log.WithField("err", err).Error("New core failed")
|
||||||
@@ -112,7 +114,6 @@ func serverHandle(_ *cobra.Command, _ []string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.Info("Nodes restarted")
|
log.Info("Nodes restarted")
|
||||||
runtime.GC()
|
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithField("err", err).Error("start watch failed")
|
log.WithField("err", err).Error("start watch failed")
|
||||||
|
|||||||
@@ -110,6 +110,10 @@ func (c *Controller) Close() error {
|
|||||||
if c.onlineIpReportPeriodic != nil {
|
if c.onlineIpReportPeriodic != nil {
|
||||||
c.onlineIpReportPeriodic.Close()
|
c.onlineIpReportPeriodic.Close()
|
||||||
}
|
}
|
||||||
|
err := c.server.DelNode(c.tag)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("del node error: %s", err)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user