diff options
Diffstat (limited to 'xray')
| -rw-r--r-- | xray/api.go | 5 | ||||
| -rw-r--r-- | xray/config.go | 1 | ||||
| -rw-r--r-- | xray/inbound.go | 1 | ||||
| -rw-r--r-- | xray/log_writer.go | 1 | ||||
| -rw-r--r-- | xray/process.go | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/xray/api.go b/xray/api.go index 1ce5afa1..5242a613 100644 --- a/xray/api.go +++ b/xray/api.go @@ -6,6 +6,7 @@ import ( "fmt" "regexp" "time" + "x-ui/logger" "x-ui/util/common" @@ -162,8 +163,8 @@ func (x *XrayAPI) GetTraffic(reset bool) ([]*Traffic, []*ClientTraffic, error) { if x.grpcClient == nil { return nil, nil, common.NewError("xray api is not initialized") } - var trafficRegex = regexp.MustCompile("(inbound|outbound)>>>([^>]+)>>>traffic>>>(downlink|uplink)") - var ClientTrafficRegex = regexp.MustCompile("(user)>>>([^>]+)>>>traffic>>>(downlink|uplink)") + trafficRegex := regexp.MustCompile("(inbound|outbound)>>>([^>]+)>>>traffic>>>(downlink|uplink)") + ClientTrafficRegex := regexp.MustCompile("(user)>>>([^>]+)>>>traffic>>>(downlink|uplink)") client := *x.StatsServiceClient ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) diff --git a/xray/config.go b/xray/config.go index 914f2134..be641b1f 100644 --- a/xray/config.go +++ b/xray/config.go @@ -2,6 +2,7 @@ package xray import ( "bytes" + "x-ui/util/json_util" ) diff --git a/xray/inbound.go b/xray/inbound.go index b3f07c7e..ea11449d 100644 --- a/xray/inbound.go +++ b/xray/inbound.go @@ -2,6 +2,7 @@ package xray import ( "bytes" + "x-ui/util/json_util" ) diff --git a/xray/log_writer.go b/xray/log_writer.go index 6c6a6e17..c8d966b5 100644 --- a/xray/log_writer.go +++ b/xray/log_writer.go @@ -3,6 +3,7 @@ package xray import ( "regexp" "strings" + "x-ui/logger" ) diff --git a/xray/process.go b/xray/process.go index 03d2eced..fcbe6f78 100644 --- a/xray/process.go +++ b/xray/process.go @@ -202,7 +202,7 @@ func (p *process) Start() (err error) { if err != nil { return common.NewErrorf("Failed to generate xray configuration file: %v", err) } - + err = os.MkdirAll(config.GetLogFolder(), 0770) if err != nil { logger.Warningf("Something went wrong: %s", err) |