From 022f40edb6d0d5ac6b967c50d50e3c2e3f302c9c Mon Sep 17 00:00:00 2001 From: Zeno Zeng Date: Sun, 21 Sep 2014 23:50:35 +0800 Subject: [PATCH] update log --- xl2tpd.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xl2tpd.sh b/xl2tpd.sh index 6f31111..86c98fb 100755 --- a/xl2tpd.sh +++ b/xl2tpd.sh @@ -20,14 +20,17 @@ # . LNS="10.5.1.9" -PPP_LOG_FILE=/var/log/zjuvpn L2TPD_CFG_FILE=/etc/xl2tpd/xl2tpd.conf USERNAME=$2 PASSWORD=$3 LAC_NAME=zju-l2tp-${USERNAME} +PPP_LOG_FILE=/tmp/zju-l2tp-log PPP_OPT_FILE=/etc/ppp/peers/${LAC_NAME} +mkdir -p /var/log/zjunet/ +LOG_FILE=/var/log/zjunet/${USERNAME} + xl2tpd_restart() { # for Openwrt / Debian / Ubuntu @@ -84,19 +87,18 @@ EOF connect() { xl2tpd-control disconnect ${LAC_NAME} > /dev/null - xl2tpd-control connect ${LAC_NAME} > /dev/null + xl2tpd-control connect ${LAC_NAME} echo -n > $PPP_LOG_FILE prev_count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | wc -l) - for i in $(seq 0 60); do + for i in $(seq 0 30); do tail $PPP_LOG_FILE + tail $PPP_LOG_FILE >> $LOG_FILE echo -n > $PPP_LOG_FILE - echo "Try to bring up ppp." - count=$(ip addr show | grep 'inet.*ppp' | grep ' 10.5.' | wc -l) if [ ${count} -gt ${prev_count} ]; then echo "Bring up ppp, done." @@ -108,7 +110,7 @@ connect() { echo "Fail to bring up ppp, timeout." - disconnect $1 + xl2tpd-control disconnect ${LAC_NAME} } case $1 in