fix: prevent conflict in log config after sync users

Author: M03ED

backend/xray/config.go

@@ -359,8 +359,18 @@ func (c *Config) ToBytes() ([]byte, error) {
 		}
 	}
 
+	// Save Variables for next use
+	aLog := c.LogConfig.AccessLog
+	eLog := c.LogConfig.ErrorLog
+	c.LogConfig.AccessLog = ""
+	c.LogConfig.ErrorLog = ""
+
 	b, err := json.Marshal(c)
 
+	// Restore variables to prevent conflict on next run
+	c.LogConfig.AccessLog = aLog
+	c.LogConfig.ErrorLog = eLog
+
 	// Release all locks
 	for _, i := range c.InboundConfigs {
 		i.mu.RUnlock()
@@ -482,13 +492,14 @@ func (c *Config) checkPolicy() {
 	}
 }
 
-func (c *Config) RemoveLogFiles() (accessFile, errorFile string) {
-	accessFile = c.LogConfig.AccessLog
-	c.LogConfig.AccessLog = ""
-	errorFile = c.LogConfig.ErrorLog
-	c.LogConfig.ErrorLog = ""
+func (c *Config) GetLogFiles() (accessFile, errorFile string) {
+	if c.LogConfig == nil {
+		c.LogConfig = &conf.LogConfig{
+			LogLevel: "info",
+		}
+	}
 
-	return accessFile, errorFile
+	return c.LogConfig.AccessLog, c.LogConfig.ErrorLog
 }
 
 func NewXRayConfig(config string, exclude []string) (*Config, error) {

backend/xray/core.go

@@ -105,17 +105,7 @@ func (c *Core) Started() bool {
 }
 
 func (c *Core) Start(xConfig *Config, debugMode bool) error {
-	logConfig := xConfig.LogConfig
-	if logConfig == nil {
-		return errors.New("log config is empty")
-	}
-
-	logLevel := logConfig.LogLevel
-	if logLevel == "none" || logLevel == "error" {
-		xConfig.LogConfig.LogLevel = "warning"
-	}
-
-	accessFile, errorFile := xConfig.RemoveLogFiles()
+	accessFile, errorFile := xConfig.GetLogFiles()
 
 	bytesConfig, err := xConfig.ToBytes()
 	if debugMode {

backend/xray/jobs.go

@@ -29,9 +29,6 @@ func (x *Xray) extractError() error {
 }
 
 func (x *Xray) checkXrayStatus(baseCtx context.Context) error {
-	consecutiveFailures := 0
-	maxFailures := 10 // Allow a few failures before restarting
-
 	for {
 		select {
 		case <-baseCtx.Done():
@@ -49,13 +46,8 @@ func (x *Xray) checkXrayStatus(baseCtx context.Context) error {
 
 			if err == nil {
 				return nil
-			} else {
-				consecutiveFailures++
-				if consecutiveFailures >= maxFailures {
-					return x.extractError()
-				}
 			}
-			time.Sleep(800 * time.Millisecond)
+			time.Sleep(500 * time.Millisecond)
 		}
 	}
 }

controller/controller.go

@@ -16,7 +16,7 @@ import (
 	"github.com/pasarguard/node/tools"
 )
 
-const NodeVersion = "0.2.5"
+const NodeVersion = "0.2.6"
 
 type Service interface {
 	Disconnect()

tools/sys.go

@@ -49,7 +49,6 @@ func GetSystemStats() (*common.SystemStatsResponse, error) {
 // Loopback interface (lo) is excluded from the calculation.
 func getBandwidthSpeed() (uint64, uint64, error) {
 	// 1) First snapshot with timestamp
-	start := time.Now()
 	first, err := net.IOCounters(true)
 	if err != nil {
 		return 0, 0, err
@@ -63,15 +62,8 @@ func getBandwidthSpeed() (uint64, uint64, error) {
 	if err != nil {
 		return 0, 0, err
 	}
-	end := time.Now()
 
-	// 4) Calculate actual elapsed time (not assumed 1 second)
-	actualDuration := end.Sub(start).Seconds()
-	if actualDuration == 0 {
-		return 0, 0, nil // avoid division by zero
-	}
-
-	// 5) Build a map from interface name → first snapshot
+	// 4) Build a map from interface name → first snapshot
 	// Skip loopback interface
 	prev := make(map[string]net.IOCountersStat, len(first))
 	for _, c := range first {
@@ -82,7 +74,7 @@ func getBandwidthSpeed() (uint64, uint64, error) {
 		prev[c.Name] = c
 	}
 
-	// 6) Compute deltas and sum across all interfaces
+	// 5) Compute deltas and sum across all interfaces
 	// Skip loopback interface
 	var totalRxBytes, totalTxBytes uint64
 	for _, c := range second {
@@ -96,10 +88,6 @@ func getBandwidthSpeed() (uint64, uint64, error) {
 		}
 	}
 
-	// 7) Convert bytes to bytes per second using ACTUAL measured time
-	rxPerSecond := uint64(float64(totalRxBytes) / actualDuration)
-	txPerSecond := uint64(float64(totalTxBytes) / actualDuration)
-
-	// 8) Return the calculated rates (bytes per second)
-	return rxPerSecond, txPerSecond, nil
+	// 6) Return the calculated rates (bytes per second)
+	return totalRxBytes, totalTxBytes, nil
 }