diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh index da60a0bd4..7ce63a8c8 100755 --- a/luci-app-passwall/root/usr/share/passwall/app.sh +++ b/luci-app-passwall/root/usr/share/passwall/app.sh @@ -1221,6 +1221,7 @@ delete_ip2route() { } start_haproxy() { + [ "$(config_t_get global_haproxy balancing_enable 0)" != "1" ] && return haproxy_path=${TMP_PATH}/haproxy haproxy_conf="config.cfg" lua $APP_PATH/haproxy.lua -path ${haproxy_path} -conf ${haproxy_conf} diff --git a/luci-app-passwall/root/usr/share/passwall/haproxy.lua b/luci-app-passwall/root/usr/share/passwall/haproxy.lua index 30a650a9a..d5fd69cca 100644 --- a/luci-app-passwall/root/usr/share/passwall/haproxy.lua +++ b/luci-app-passwall/root/usr/share/passwall/haproxy.lua @@ -7,10 +7,6 @@ local jsonc = api.jsonc local uci = api.uci local sys = api.sys -if uci:get_first(appname, 'global_haproxy', "balancing_enable", 0) ~= 1 then - return -end - local log = function(...) local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ") local f, err = io.open("/tmp/log/passwall.log", "a")