Skip to content

修复 日志占用的空间无法正确释放 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Canary233 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

修复 日志占用的空间无法正确释放 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions luci-app-easytier/luasrc/controller/easytier.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,19 +365,19 @@ function get_log()
end

function get_log_size()
local size = luci.sys.exec("[ -f '/tmp/easytier.log' ] && stat -c%s /tmp/easytier.log 2>/dev/null || echo 0")
local size = luci.sys.exec("[ -f '/tmp/easytier.log' ] && wc -c < /tmp/easytier.log 2>/dev/null || echo 0")
luci.http.prepare_content("application/json")
luci.http.write_json({size = tonumber(size) or 0})
end

function get_wlog_size()
local size = luci.sys.exec("[ -f '/tmp/easytierweb.log' ] && stat -c%s /tmp/easytierweb.log 2>/dev/null || echo 0")
local size = luci.sys.exec("[ -f '/tmp/easytierweb.log' ] && wc -c < /tmp/easytierweb.log 2>/dev/null || echo 0")
luci.http.prepare_content("application/json")
luci.http.write_json({size = tonumber(size) or 0})
end

function clear_log()
luci.sys.call("echo '' >/tmp/easytier.log")
luci.sys.call(": >/tmp/easytier.log; rm -f /tmp/easytier.log.[0-9]*")
end

local function test_binary(path)
Expand Down Expand Up @@ -582,7 +582,7 @@ function get_wlog()
end

function clear_wlog()
luci.sys.call("echo '' >/tmp/easytierweb.log")
luci.sys.call(": >/tmp/easytierweb.log")
end

function clear_version_cache()
Expand Down
52 changes: 16 additions & 36 deletions luci-app-easytier/root/etc/init.d/easytier
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ while true; do
break
fi
sleep $((time))
[ "$(du -k /tmp/easytier.log | cut -f1)" = "1000" ] && echo " " >/tmp/easytier.log
done
EOF
chmod +x /tmp/easytier_check
Expand Down Expand Up @@ -174,18 +173,10 @@ check_config() {
get_tz
[ -z "$SET_TZ" ] || procd_set_param env TZ="$SET_TZ"
procd_set_param command /bin/sh -c "
cd /tmp ; ${easytierbin} -c ${config_file} --console-log-level ${log} >> /tmp/easytier.log 2>&1 &
. /usr/share/easytier/utils.sh
cd /tmp ; ET_FILE_LOG_LEVEL=off ET_FILE_LOG_DIR=/tmp/easytier-internal-log ET_FILE_LOG_SIZE=1 ET_FILE_LOG_COUNT=1 ${easytierbin} -c ${config_file} --console-log-level ${log} >> /tmp/easytier.log 2>&1 &
ET_CORE_PID=\$!
{
while true; do
LOG_SIZE=\$(ls -l /tmp/easytier.log | awk '{print int(\$5/1024)}')
if [ \$LOG_SIZE -gt 5120 ]; then
tail -n 500 /tmp/easytier.log > /tmp/easytier.log.tmp
mv /tmp/easytier.log.tmp /tmp/easytier.log
fi
sleep 300
done
} &
manage_log_size /tmp/easytier.log 5120 500 &
LOG_MANAGEMENT_PID=\$!
trap \"kill -TERM \$ET_CORE_PID; kill -TERM \$LOG_MANAGEMENT_PID; exit\" SIGINT SIGTERM EXIT
wait \$ET_CORE_PID
Expand Down Expand Up @@ -597,18 +588,10 @@ EOF
[ -z "$desvice_name" ] || core_cmd="${core_cmd} --hostname $(shell_quote "$desvice_name")"
fi
procd_set_param command /bin/sh -c "
cd /tmp ; ${easytierbin} ${core_cmd} --console-log-level ${log} >> /tmp/easytier.log 2>&1 &
. /usr/share/easytier/utils.sh
cd /tmp ; ET_FILE_LOG_LEVEL=off ET_FILE_LOG_DIR=/tmp/easytier-internal-log ET_FILE_LOG_SIZE=1 ET_FILE_LOG_COUNT=1 ${easytierbin} ${core_cmd} --console-log-level ${log} >> /tmp/easytier.log 2>&1 &
ET_CORE_PID=\$!
{
while true; do
LOG_SIZE=\$(ls -l /tmp/easytier.log | awk '{print int(\$5/1024)}')
if [ \$LOG_SIZE -gt 5120 ]; then
tail -n 500 /tmp/easytier.log > /tmp/easytier.log.tmp
mv /tmp/easytier.log.tmp /tmp/easytier.log
fi
sleep 300
done
} &
manage_log_size /tmp/easytier.log 5120 500 &
LOG_MANAGEMENT_PID=\$!
trap \"kill -TERM \$ET_CORE_PID; kill -TERM \$LOG_MANAGEMENT_PID; exit\" SIGINT SIGTERM EXIT
wait \$ET_CORE_PID
Expand Down Expand Up @@ -746,18 +729,10 @@ start_web() {
web_cmd="${web_cmd} --console-log-level $weblog"
fi
procd_set_param command /bin/sh -c "
. /usr/share/easytier/utils.sh
cd /tmp ; ${webbin} ${web_cmd} >> /tmp/easytierweb.log 2>&1 &
ET_WEB_PID=\$!
{
while true; do
LOG_SIZE=\$(ls -l /tmp/easytierweb.log | awk '{print int(\$5/1024)}')
if [ \$LOG_SIZE -gt 5120 ]; then
tail -n 500 /tmp/easytierweb.log > /tmp/easytierweb.log.tmp
mv /tmp/easytierweb.log.tmp /tmp/easytierweb.log
fi
sleep 300
done
} &
manage_log_size /tmp/easytierweb.log 5120 500 &
LOG_MANAGEMENT_PID=\$!
trap \"kill -TERM \$ET_WEB_PID; kill -TERM \$LOG_MANAGEMENT_PID; exit\" SIGINT SIGTERM EXIT
wait \$ET_WEB_PID
Expand Down Expand Up @@ -815,8 +790,10 @@ start_service() {
mipstype=$(echo -n I | hexdump -o 2>/dev/null | awk '{ print substr($2,6,1); exit}')
[ "$mipstype" = "0" ] && cpucore="mips" || cpucore="mipsel"
fi
echo "" >/tmp/easytier.log
echo "" >/tmp/easytierweb.log
rm -f /tmp/easytier.log.[0-9]*
rm -rf /tmp/easytier-internal-log
: >/tmp/easytier.log
: >/tmp/easytierweb.log
size="$(df -k | awk '/\/overlay$/ {sub(/K$/, "", $4); print $4}')"
[ -z "$size" ] && size="$(df -kP /usr/bin | awk 'NR==2 {print $(NF-2) }')"
if [ -z "$(uci -q get easytier.@easytier[0].web_enabled)" ] ; then
Expand Down Expand Up @@ -884,7 +861,10 @@ stop_service() {

rm -rf /tmp/easytier-cli_peer /tmp/easytier-cli_connector /tmp/easytier-cli_stun /tmp/easytier-cli_route /tmp/easytier-cli_acl >/dev/null 2>&1
rm -rf /tmp/easytier-cli_peer-center /tmp/easytier-cli_vpn-portal /tmp/easytier_cmd /tmp/easytier-cli_node /tmp/easytier-cli_mapped_listener >/dev/null 2>&1
rm -rf /tmp/easytier-*.* /tmp/easytier.log >/dev/null 2>&1
rm -rf /tmp/easytier-*.* >/dev/null 2>&1
rm -f /tmp/easytier.log.[0-9]* >/dev/null 2>&1
rm -rf /tmp/easytier-internal-log >/dev/null 2>&1
: >/tmp/easytier.log
echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : easytier-core 停止运行" >>/tmp/easytier.log
fi
if [ "$(uci -q get easytier.@easytier[0].web_enabled)" = "0" ] ; then
Expand Down
9 changes: 6 additions & 3 deletions luci-app-easytier/root/usr/share/easytier/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,17 @@ manage_log_size() {
local logfile="$1"
local max_size_kb="${2:-5120}"
local keep_lines="${3:-500}"
local check_interval="${4:-10}"

while true; do
local log_size=$(ls -l "$logfile" 2>/dev/null | awk '{print int($5/1024)}')
if [ "${log_size:-0}" -gt "$max_size_kb" ]; then
tail -n "$keep_lines" "$logfile" > "${logfile}.tmp"
mv "${logfile}.tmp" "$logfile"
if tail -n "$keep_lines" "$logfile" > "${logfile}.tmp"; then
cat "${logfile}.tmp" > "$logfile"
fi
rm -f "${logfile}.tmp"
fi
sleep 300
sleep "$check_interval"
done
}

Expand Down