Skip to content
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

Add front-end display logs #1530

Closed
wants to merge 1 commit into from
Closed

Add front-end display logs #1530

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
28 changes: 28 additions & 0 deletions package/openwrt/files/etc/init.d/smartdns
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,33 @@ COREDUMP="0"
RESPAWN="1"
DO_RELOAD="0"

make_dir() {
local d
for d in "$@"; do
if [ ! -d "$d" ]; then
mkdir -p "$d" 2>/dev/null || return 1
fi
done

return 0
}

log_dir() {
local section="$1"

config_get log_file "$section" "log_file" ""
log_file="${log_file:-"/var/log/smartdns/smartdns.log"}"

local log_dir
log_dir="$(dirname "${log_file}")"

[ -s ${log_file} ] || {
[ -d "$log_dir" ] || {
make_dir "$log_dir" || return 1
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里为什么要在启动程序前创建目录？
smartdns程序会自动创建目录，这里是不是可以不用？

Copy link
Contributor Author

@zxlhhyccc zxlhhyccc Oct 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

去掉创建目录代码修改为其他目录，测试了一下，貌似前端可以读取日志。。。！

明天再测试一下，如果没问题就去掉创建目录代码！

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看了一下源码并经测试，最终确定，无论设置何路径，软件会自动按照设置的路径生成日志，因此可以不需要启动前创建目录，此pr关闭。不过luci添加了前端显示日志的pr，请大佬合并！

}
}
}

set_forward_dnsmasq()
{
local PORT="$1"
Expand Down Expand Up @@ -170,6 +197,7 @@ get_tz()

load_server()
{
log_dir
local section="$1"
local ADDITIONAL_ARGS=""
local DNS_ADDRESS=""
Expand Down
Loading