From 569c9428fb7924fb693605385f745e4bf524dc20 Mon Sep 17 00:00:00 2001
From: Hamidreza <70919649+hamid-gh98@users.noreply.github.com>
Date: Wed, 13 Mar 2024 11:24:41 +0330
Subject: [iplimit] fix access log path in settings service (#2044)

* [iplimit] fix access log path in settings service

better to avoid hardcoding the access log path to enhance flexibility. not all users prefer the default './access.log'

* [iplimit] fix iplimit
---
 xray/process.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'xray')

diff --git a/xray/process.go b/xray/process.go
index fcbe6f78..3203d7cd 100644
--- a/xray/process.go
+++ b/xray/process.go
@@ -57,28 +57,28 @@ func GetAccessPersistentPrevLogPath() string {
 	return config.GetLogFolder() + "/3xipl-ap.prev.log"
 }
 
-func GetAccessLogPath() string {
+func GetAccessLogPath() (string, error) {
 	config, err := os.ReadFile(GetConfigPath())
 	if err != nil {
 		logger.Warningf("Something went wrong: %s", err)
+		return "", err
 	}
 
 	jsonConfig := map[string]interface{}{}
 	err = json.Unmarshal([]byte(config), &jsonConfig)
 	if err != nil {
 		logger.Warningf("Something went wrong: %s", err)
+		return "", err
 	}
 
 	if jsonConfig["log"] != nil {
 		jsonLog := jsonConfig["log"].(map[string]interface{})
 		if jsonLog["access"] != nil {
-
 			accessLogPath := jsonLog["access"].(string)
-
-			return accessLogPath
+			return accessLogPath, nil
 		}
 	}
-	return ""
+	return "", err
 }
 
 func stopProcess(p *Process) {
@@ -203,7 +203,7 @@ func (p *process) Start() (err error) {
 		return common.NewErrorf("Failed to generate xray configuration file: %v", err)
 	}
 
-	err = os.MkdirAll(config.GetLogFolder(), 0770)
+	err = os.MkdirAll(config.GetLogFolder(), 0o770)
 	if err != nil {
 		logger.Warningf("Something went wrong: %s", err)
 	}
-- 
cgit v1.2.3