zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: fixed https://github.com/xiaorouji/openwrt-passwall/issues/2421

Browse Source
This commit is contained in:
xiaorouji 2023-03-29 11:10:38 +08:00 committed by sbwml
parent 80408356a4
commit 3dd970b324
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -1221,6 +1221,7 @@ delete_ip2route() {
} }
start_haproxy() { start_haproxy() {
[ "$(config_t_get global_haproxy balancing_enable 0)" != "1" ] && return
haproxy_path=${TMP_PATH}/haproxy haproxy_path=${TMP_PATH}/haproxy
haproxy_conf="config.cfg" haproxy_conf="config.cfg"
lua $APP_PATH/haproxy.lua -path ${haproxy_path} -conf ${haproxy_conf} lua $APP_PATH/haproxy.lua -path ${haproxy_path} -conf ${haproxy_conf}

4
luci-app-passwall/root/usr/share/passwall/haproxy.lua
View File

@ -7,10 +7,6 @@ local jsonc = api.jsonc
local uci = api.uci local uci = api.uci
local sys = api.sys local sys = api.sys
if uci:get_first(appname, 'global_haproxy', "balancing_enable", 0) ~= 1 then
return
end
local log = function(...) local log = function(...)
local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ") local result = os.date("%Y-%m-%d %H:%M:%S: ") .. table.concat({...}, " ")
local f, err = io.open("/tmp/log/passwall.log", "a") local f, err = io.open("/tmp/log/passwall.log", "a")