From 64a5a9f1bc91297bf46ddda9fc3575e582acd83f Mon Sep 17 00:00:00 2001
From: Hamidreza <70919649+hamid-gh98@users.noreply.github.com>
Date: Mon, 11 Mar 2024 01:01:24 +0330
Subject: 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
---
 xray/api.go        | 5 +++--
 xray/config.go     | 1 +
 xray/inbound.go    | 1 +
 xray/log_writer.go | 1 +
 xray/process.go    | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'xray')

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)
-- 
cgit v1.2.3