diff options
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | web/controller/inbound.go | 8 | ||||
| -rw-r--r-- | web/service/inbound.go | 2 | ||||
| -rw-r--r-- | xray/config.go | 25 |
4 files changed, 19 insertions, 18 deletions
@@ -343,7 +343,7 @@ func main() { updateTgbotEnableSts(enabletgbot) } default: - fmt.Println("except 'run' or 'setting' subcommands") + fmt.Println("Invalid subcommands") fmt.Println() runCmd.Usage() fmt.Println() diff --git a/web/controller/inbound.go b/web/controller/inbound.go index 7ef3245f..511afd64 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -175,7 +175,7 @@ func (a *InboundController) addInboundClient(c *gin.Context) { return } jsonMsg(c, "Client(s) added", nil) - if err == nil && needRestart { + if needRestart { a.xrayService.SetToNeedRestart() } } @@ -196,7 +196,7 @@ func (a *InboundController) delInboundClient(c *gin.Context) { return } jsonMsg(c, "Client deleted", nil) - if err == nil && needRestart { + if needRestart { a.xrayService.SetToNeedRestart() } } @@ -219,7 +219,7 @@ func (a *InboundController) updateInboundClient(c *gin.Context) { return } jsonMsg(c, "Client updated", nil) - if err == nil && needRestart { + if needRestart { a.xrayService.SetToNeedRestart() } } @@ -240,7 +240,7 @@ func (a *InboundController) resetClientTraffic(c *gin.Context) { return } jsonMsg(c, "traffic reseted", nil) - if err == nil && needRestart { + if needRestart { a.xrayService.SetToNeedRestart() } } diff --git a/web/service/inbound.go b/web/service/inbound.go index e9b1e595..d71057b1 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -969,7 +969,7 @@ func (s *InboundService) disableInvalidInbounds(tx *gorm.DB) (bool, int64, error s.xrayApi.Init(p.GetAPIPort()) for _, tag := range tags { err1 := s.xrayApi.DelInbound(tag) - if err == nil { + if err1 == nil { logger.Debug("Inbound disabled by api:", tag) } else { logger.Debug("Error in disabling inbound by api:", err1) diff --git a/xray/config.go b/xray/config.go index be641b1f..67ff7d95 100644 --- a/xray/config.go +++ b/xray/config.go @@ -7,18 +7,19 @@ import ( ) type Config struct { - LogConfig json_util.RawMessage `json:"log"` - RouterConfig json_util.RawMessage `json:"routing"` - DNSConfig json_util.RawMessage `json:"dns"` - InboundConfigs []InboundConfig `json:"inbounds"` - OutboundConfigs json_util.RawMessage `json:"outbounds"` - Transport json_util.RawMessage `json:"transport"` - Policy json_util.RawMessage `json:"policy"` - API json_util.RawMessage `json:"api"` - Stats json_util.RawMessage `json:"stats"` - Reverse json_util.RawMessage `json:"reverse"` - FakeDNS json_util.RawMessage `json:"fakedns"` - Observatory json_util.RawMessage `json:"observatory"` + LogConfig json_util.RawMessage `json:"log"` + RouterConfig json_util.RawMessage `json:"routing"` + DNSConfig json_util.RawMessage `json:"dns"` + InboundConfigs []InboundConfig `json:"inbounds"` + OutboundConfigs json_util.RawMessage `json:"outbounds"` + Transport json_util.RawMessage `json:"transport"` + Policy json_util.RawMessage `json:"policy"` + API json_util.RawMessage `json:"api"` + Stats json_util.RawMessage `json:"stats"` + Reverse json_util.RawMessage `json:"reverse"` + FakeDNS json_util.RawMessage `json:"fakedns"` + Observatory json_util.RawMessage `json:"observatory"` + BurstObservatory json_util.RawMessage `json:"burstObservatory"` } func (c *Config) Equals(other *Config) bool { |