diff options
| author | Hamidreza <70919649+hamid-gh98@users.noreply.github.com> | 2024-03-11 00:31:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-11 00:31:24 +0300 |
| commit | 64a5a9f1bc91297bf46ddda9fc3575e582acd83f (patch) | |
| tree | f8a3cbd685bf4ef77bb69b6b22c130d2dad42f88 /web/service/xray.go | |
| parent | 32afd7200ace358fe36c8c438f5048d76fbc987b (diff) | |
Some fixes and improvements (#1997)
* [refactor] api controller
* [fix] access log path
better to not hardcode the access log path, maybe some ppl dont want to use the default ./access.log
* [fix] set select options from logs paths in xray settings
* [update] .gitignore
* [lint] all .go files
* [update] use status code for jsonMsg and 401 to unauthorize
* [update] handle response status code via axios
* [fix] set correct value if log paths is set to 'none'
we also use the default value for the paths if its set to none
* [fix] iplimit - only warning access log if f2b is installed
Diffstat (limited to 'web/service/xray.go')
| -rw-r--r-- | web/service/xray.go | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/web/service/xray.go b/web/service/xray.go index 7cd1612c..6074216d 100644 --- a/web/service/xray.go +++ b/web/service/xray.go @@ -4,16 +4,19 @@ import ( "encoding/json" "errors" "sync" + "x-ui/logger" "x-ui/xray" "go.uber.org/atomic" ) -var p *xray.Process -var lock sync.Mutex -var isNeedXrayRestart atomic.Bool -var result string +var ( + p *xray.Process + lock sync.Mutex + isNeedXrayRestart atomic.Bool + result string +) type XrayService struct { inboundService InboundService @@ -87,7 +90,6 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) { // check users active or not clientStats := inbound.ClientStats for _, clientTraffic := range clientStats { - indexDecrease := 0 for index, client := range clients { c := client.(map[string]interface{}) @@ -96,20 +98,15 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) { clients = RemoveIndex(clients, index-indexDecrease) indexDecrease++ logger.Info("Remove Inbound User ", c["email"], " due the expire or traffic limit") - } - } } - } // clear client config for additional parameters var final_clients []interface{} for _, client := range clients { - c := client.(map[string]interface{}) - if c["enable"] != nil { if enable, ok := c["enable"].(bool); ok && !enable { continue |
