Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/benchmark
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
############

# Version
version=1.2.2
version=1.2.3
# Individual benchmark time limit (seconds)
# Quick benchmark
test_run_time_quick=6
Expand Down Expand Up @@ -177,7 +177,7 @@ _run-benchmark() {
memory) params=("${params[@]}" "--threads=${2}" "--memory-block-size=${3}" "--memory-total-size=${4}" "--memory-access-mode=${5}" memory) ;;
disk) params=("${params[@]}" "--threads=${2}" "--file-num=${3}" "--file-block-size=${4}" "--file-test-mode=${5}" "--file-fsync-all=${6}" "--file-rw-ratio=${7}" "--file-total-size=${8}" fileio) ;;
download)
curl -4 --max-time 60 --no-progress-meter -o /dev/null -w "%{speed_download}\n" --url "${4}"
curl --disable -4 --max-time 60 --no-progress-meter -o /dev/null -w "%{speed_download}\n" --url "${4}"
return 0
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion lib/network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ iplocation() {
params="access_key=${IPSTACK_TOKEN}&fields=city,region_name,country_name,continent_name,hostname,ip&hostname=1"

for arg in "${@}"; do
if ! result=$(curl --no-progress-meter -w"\n" "http://api.ipstack.com/${arg}?${params}"); then
if ! result=$(curl --disable --no-progress-meter -w"\n" "http://api.ipstack.com/${arg}?${params}"); then
return 1
fi
jq '.' <<<"${result}"
Expand Down