Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
oooldking committed Feb 7, 2018
1 parent 6d5073e commit 55a4950
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion superbench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ speed() {
chmod a+rx /tmp/speedtest.py

speed_test '' 'Normal Node'
speed_test '4595' 'Zhengzhou CT'
speed_test '6435' 'Xiangyang CT'
speed_test '7509' 'Kunming CT'
speed_test '3633' 'Shanghai CT'
speed_test '4624' 'Chengdu CT'
Expand Down
28 changes: 14 additions & 14 deletions superspeed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,16 @@ if [[ ${telecom} == 3 ]]; then
fi

# install speedtest
if [ ! -e './speedtest.py' ]; then
if [ ! -e '/tmp/speedtest.py' ]; then
wget --no-check-certificate -P /tmp https://raw.github.com/sivel/speedtest-cli/master/speedtest.py > /dev/null 2>&1
fi
chmod a+rx /tmp/speedtest.py

result() {
download=`cat speed.log | awk -F ':' '/Download/{print $2}'`
upload=`cat speed.log | awk -F ':' '/Upload/{print $2}'`
hostby=`cat speed.log | awk -F ':' '/Hosted/{print $1}'`
latency=`cat speed.log | awk -F ':' '/Hosted/{print $2}'`
download=`cat /tmp/speed.log | awk -F ':' '/Download/{print $2}'`
upload=`cat /tmp/speed.log | awk -F ':' '/Upload/{print $2}'`
hostby=`cat /tmp/speed.log | awk -F ':' '/Hosted/{print $1}'`
latency=`cat /tmp/speed.log | awk -F ':' '/Hosted/{print $2}'`
clear
echo "$hostby"
echo "延迟 : $latency"
Expand Down Expand Up @@ -377,32 +377,32 @@ speed_test(){
}

if [[ ${telecom} =~ ^[1-3]$ ]]; then
python /tmp/speedtest.py --server ${num} --share 2>/dev/null | tee speed.log 2>/dev/null
is_down=$(cat speed.log | grep 'Download')
python /tmp/speedtest.py --server ${num} --share 2>/dev/null | tee /tmp/speed.log 2>/dev/null
is_down=$(cat /tmp/speed.log | grep 'Download')

if [[ ${is_down} ]]; then
result
echo "测试到 ${cityName}${telecomName} 完成!"
rm -rf speedtest.py
rm -rf speed.log
rm -rf /tmp/speedtest.py
rm -rf /tmp/speed.log
else
echo -e "\n${RED}ERROR:${PLAIN} 当前节点不可用,请更换其他节点,或换个时间段再测试。"
fi
fi

if [[ ${telecom} == 4 ]]; then
python /tmp/speedtest.py | tee speed.log
python /tmp/speedtest.py | tee /tmp/speed.log
result
echo "本地测试完成!"
rm -rf speedtest.py
rm -rf speed.log
rm -rf /tmp/speedtest.py
rm -rf /tmp/speed.log
fi

if [[ ${telecom} == 5 ]]; then
echo ""
printf "%-14s%-18s%-20s%-12s\n" "Node Name" "Upload Speed" "Download Speed" "Latency"
start=$(date +%s)
speed_test '4595' '郑州电信'
speed_test '6435' '襄阳电信'
speed_test '7509' '昆明电信'
speed_test '3633' '上海电信'
speed_test '4624' '成都电信'
Expand All @@ -415,7 +415,7 @@ if [[ ${telecom} == 5 ]]; then
speed_test '6715' '宁波移动'
speed_test '4575' '成都移动'
end=$(date +%s)
rm -rf speedtest.py
rm -rf /tmp/speedtest.py
echo ""
time=$(( $end - $start ))
if [[ $time -gt 60 ]]; then
Expand Down

0 comments on commit 55a4950

Please sign in to comment.