mirror of
https://github.com/teddysun/across.git
synced 2025-01-19 06:19:35 +08:00
Merge branch 'master' of github.com:teddysun/across
This commit is contained in:
commit
5a8ec0c4b9
14
bench.sh
14
bench.sh
@ -49,7 +49,7 @@ speed_test_v6() {
|
||||
|
||||
speed_v4() {
|
||||
speed_test_v4 'http://cachefly.cachefly.net/100mb.test' 'CacheFly'
|
||||
speed_test_v4 'http://speedtest.tokyo.linode.com/100MB-tokyo.bin' 'Linode, Tokyo, JP'
|
||||
speed_test_v4 'http://speedtest.tokyo2.linode.com/100MB-tokyo2.bin' 'Linode, Tokyo2, JP'
|
||||
speed_test_v4 'http://speedtest.singapore.linode.com/100MB-singapore.bin' 'Linode, Singapore, SG'
|
||||
speed_test_v4 'http://speedtest.london.linode.com/100MB-london.bin' 'Linode, London, UK'
|
||||
speed_test_v4 'http://speedtest.frankfurt.linode.com/100MB-frankfurt.bin' 'Linode, Frankfurt, DE'
|
||||
@ -66,7 +66,7 @@ speed_v6() {
|
||||
speed_test_v6 'http://speedtest.dallas.linode.com/100MB-dallas.bin' 'Linode, Dallas, TX'
|
||||
speed_test_v6 'http://speedtest.newark.linode.com/100MB-newark.bin' 'Linode, Newark, NJ'
|
||||
speed_test_v6 'http://speedtest.singapore.linode.com/100MB-singapore.bin' 'Linode, Singapore, SG'
|
||||
speed_test_v6 'http://speedtest.tokyo.linode.com/100MB-tokyo.bin' 'Linode, Tokyo, JP'
|
||||
speed_test_v6 'http://speedtest.tokyo2.linode.com/100MB-tokyo2.bin' 'Linode, Tokyo2, JP'
|
||||
speed_test_v6 'http://speedtest.sjc03.softlayer.com/downloads/test100.zip' 'Softlayer, San Jose, CA'
|
||||
speed_test_v6 'http://speedtest.wdc01.softlayer.com/downloads/test100.zip' 'Softlayer, Washington, WA'
|
||||
speed_test_v6 'http://speedtest.par01.softlayer.com/downloads/test100.zip' 'Softlayer, Paris, FR'
|
||||
@ -106,7 +106,7 @@ opsy=$( get_opsy )
|
||||
arch=$( uname -m )
|
||||
lbit=$( getconf LONG_BIT )
|
||||
kern=$( uname -r )
|
||||
ipv6=$( wget -qO- -t1 -T2 ipv6.icanhazip.com )
|
||||
#ipv6=$( wget -qO- -t1 -T2 ipv6.icanhazip.com )
|
||||
disk_size1=($( LANG=C df -hPl | grep -wvE '\-|none|tmpfs|devtmpfs|by-uuid|chroot|Filesystem|udev|docker' | awk '{print $2}' ))
|
||||
disk_size2=($( LANG=C df -hPl | grep -wvE '\-|none|tmpfs|devtmpfs|by-uuid|chroot|Filesystem|udev|docker' | awk '{print $3}' ))
|
||||
disk_total_size=$( calc_disk "${disk_size1[@]}" )
|
||||
@ -144,7 +144,7 @@ echo -e "Average I/O speed : ${YELLOW}$ioavg MB/s${PLAIN}"
|
||||
next
|
||||
printf "%-32s%-24s%-14s\n" "Node Name" "IPv4 address" "Download Speed"
|
||||
speed_v4 && next
|
||||
if [[ "$ipv6" != "" ]]; then
|
||||
printf "%-32s%-24s%-14s\n" "Node Name" "IPv6 address" "Download Speed"
|
||||
speed_v6 && next
|
||||
fi
|
||||
#if [[ "$ipv6" != "" ]]; then
|
||||
# printf "%-32s%-24s%-14s\n" "Node Name" "IPv6 address" "Download Speed"
|
||||
# speed_v6 && next
|
||||
#fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user