diff --git a/package/ctcgfw/luci-app-serverchan/root/etc/config/serverchan b/package/ctcgfw/luci-app-serverchan/root/etc/config/serverchan index b120684af6..b7d3df739c 100644 --- a/package/ctcgfw/luci-app-serverchan/root/etc/config/serverchan +++ b/package/ctcgfw/luci-app-serverchan/root/etc/config/serverchan @@ -1,16 +1,19 @@ config serverchan 'serverchan' option serverchan_ip '1' - option serverchan_up '1' option serverchan_down '1' option serverchan_sleeptime '60' option sheep_enabled '1' option temp_mask '1' option cpuload_enable '1' option temperature_enable '1' + option serverchan_ipv6 '0' + option serverchan_sheep '0' option cpuload '2' - option temperature '70' option send_enable '0' option serverchan_enable '0' - option serverchan_sheep '0' + option serverchan_ipv4 '0' + option serverchan_up '1' + option up_timeout '2' + option down_timeout '10' diff --git a/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan b/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan index 1902ce7d4e..8132111024 100755 --- a/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan +++ b/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan @@ -216,12 +216,13 @@ function usage(){ function usage_ip(){ if [ "$1" ] ;then - if [ -f "${dir}usage.db" ] ; then ip=`cat /tmp/serverchan/usage.db | grep -w $1`;else return;fi + if [ -f ${dir}usage.db ] ; then ip=`cat ${dir}usage.db | grep -w $1`;else return;fi if [ ! -z "$ip" ] ; then ip=`echo $ip | sed 's/,/ /g'`;fi if [ ! -z "$ip" ] ; then ip_total=`echo $ip | awk '{print $6}'`;fi if [ ! -z "$ip_total" ] ; then echo `bytes_for_humans $ip_total`;fi fi } + # 流量数据剔除ip function usage_down(){ if [ ! -f "${dir}usage.db" ] ; then return;fi @@ -509,7 +510,7 @@ function soc_temp(){ # 发送定时数据 function send(){ - if [ ! -z "$debuglevel" ] && [ "$debuglevel" -ne "1" ] ; then echo "`date "+%Y-%m-%d %H:%M:%S"` 【定时数据】创建定时任务" >> ${logfile};fi + echo "`date "+%Y-%m-%d %H:%M:%S"` 【定时数据】创建定时任务" >> ${logfile} uci set serverchan.serverchan.send_enable=3 uci commit serverchan unset title @@ -576,7 +577,7 @@ function send(){ time_up=$( cat ${dir}ipAddress | grep -w $ip |awk '{print $4}' | grep -v "^$" | sort -u ) time1=$(($time_down-$time_up)) time1=`time_for_humans $time1` - send_content=${send_content}"%0D%0A%0D%0A"" `cat ${dir}ipAddress | grep -w $ip | awk '{print $3}' | grep -v "^$" | sort -u` $ip%0D%0A%0D%0A"" 在线 $time1" + send_content=${send_content}"%0D%0A%0D%0A"" `cat ${dir}ipAddress | grep -w $ip | awk '{print $3}' | grep -v "^$" | sort -u` $ip%0D%0A%0D%0A"" $ip_total在线 $time1" done fi if [ ! -z "$device_name" ] ; then send_title="【$device_name】$send_title" ;fi