change error log

Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-seu-net
-PKG_VERSION:=1.21
+PKG_VERSION:=1.23
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

root/usr/bin/seu-net/seu-net

@@ -26,14 +26,47 @@ function get_val(){
 		wan_ip=$ip_temp
 	fi
 	if [ -z "$username" ]; then
-		echo "`date "+%Y-%m-%d %H:%M:%S"`没有用户名" >> ${logfile}
-		get_val
+		while [ 1 ]
+		do
+			sleep 2s
+			echo "`date "+%Y-%m-%d %H:%M:%S"`没有用户名"$username >> ${logfile}
+			if [ -z "$username" ]; then
+				username=$(uci get seu-net.@seu-net[0].username)
+			else
+				break
+			fi
+		done
 	elif [ -z "$password" ]; then
-		echo "`date "+%Y-%m-%d %H:%M:%S"`没有密码" >> ${logfile}
-		get_val
+		while [ 1 ]
+		do
+			sleep 2s
+			echo "`date "+%Y-%m-%d %H:%M:%S"`没有密码"$password >> ${logfile}
+			if [ -z "$password" ]; then
+				password=$(uci get seu-net.@seu-net[0].password)
+			else
+				break
+			fi
+		done
 	elif [ -z "$wan_ip" ]; then
-		echo "`date "+%Y-%m-%d %H:%M:%S"`没有wan_ip" >> ${logfile}
-		get_val
+		while [ 1 ]
+		do
+			sleep 2s
+			IP=$(ip a|grep -w 'inet'|grep 'global'|sed 's/^.*inet //g'|sed 's/\/[0-9][0-9].*$//g')
+			echo "`date "+%Y-%m-%d %H:%M:%S"`没有wan_ip"$wan_ip >> ${logfile}
+			echo $IP >> ${logfile}
+			if [ -z "$wan_ip" ]; then
+				wan_enable=$(uci get seu-net.@seu-net[0].wan_enable)
+				if [ "$wan_enable" -eq "1" ];then
+					wan_ip=$(uci get seu-net.@seu-net[0].wan_ip)
+				else
+					ipv4_interface=$(uci get seu-net.@seu-net[0].ipv4_interface)
+					ip_temp=$(/sbin/ifconfig ${ipv4_interface}|awk '/inet addr/ {print $2}'|awk -F: '{print $2}'|grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}') || ip_temp=$(ubus call network.interface.wan status|grep '\"address\"'|grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')
+					wan_ip=$ip_temp
+				fi
+			else
+				break
+			fi
+		done
 	fi
 	method=$(uci get seu-net.@seu-net[0].method)
 	case $method in