From 0917eb2742003fa9cf83a522e6b9d758c4b3a7de Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Mon, 11 Mar 2024 23:56:23 +0330 Subject: [PATCH] Fix empty log path handling --- web/html/xui/xray.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/web/html/xui/xray.html b/web/html/xui/xray.html index 54665c27..ba6f0771 100644 --- a/web/html/xui/xray.html +++ b/web/html/xui/xray.html @@ -1408,21 +1408,16 @@ templateSettings: { get: function () { const parsedSettings = this.xraySetting ? JSON.parse(this.xraySetting) : null; - let accessLogPath = "./access.log"; - let errorLogPath = "./error.log"; - if (parsedSettings) { - // if its set to "none" add default value - if (parsedSettings.log.access !== "none") accessLogPath = parsedSettings.log.access; - if (parsedSettings.log.error !== "none") errorLogPath = parsedSettings.log.error; - } - this.access = ["none", accessLogPath]; - this.error = ["none", errorLogPath]; + const setLogPath = (type, defaultValue) => parsedSettings?.log?.[type] !== "none" ? parsedSettings.log[type] : defaultValue; + this.access = ["none", setLogPath("access", "./access.log")]; + this.error = ["none", setLogPath("error", "./error.log")]; return parsedSettings; }, set: function (newValue) { this.xraySetting = JSON.stringify(newValue, null, 2); - this.access = ["none", newValue.log.access]; - this.error = ["none", newValue.log.error]; + const setLogPath = (type, defaultValue) => newValue.log?.[type] ? newValue.log[type] : defaultValue; + this.access = ["none", setLogPath("access", "./access.log")]; + this.error = ["none", setLogPath("error", "./error.log")]; }, }, inboundSettings: {