diff options
| -rwxr-xr-x | scripts/test.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/test.sh b/scripts/test.sh index 57e319e..886d3f8 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -93,17 +93,25 @@ function main() { if [[ -z "$avg_rate" ]]; then avg_rate="n/a" else - avg_rate="$avg_rate"s + avg_rate="$avg_rate"/s fi num_onion=$(wc -l "$stdout_file" | cut -d' ' -f1) processed=$(grep 'Processed:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) success=$(grep 'Success:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) failure=$(grep 'Failure:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) - failure_ctx=$(grep 'CTX:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) + failure_req=$(grep 'Req:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) failure_dns=$(grep 'DNS:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) + failure_tcp=$(grep 'TCP:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) + failure_tls=$(grep 'TLS:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) + failure_3xx=$(grep '3xx:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) + failure_ctx=$(grep 'CTX:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) + failure_qqq=$(grep '???:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f2) failure_dns_detailed=$(grep 'DNS:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f3-) - info "relay:$relay limit:$limit/s avg-rate:$avg_rate onions:$num_onion connected:$success/$processed deadline-error:$failure_ctx/$failure dns-error:$failure_dns/$failure $failure_dns_detailed" + failure_tls_detailed=$(grep 'TLS:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f3-) + info "relay:$relay limit:$limit/s rate:$avg_rate onions:$num_onion connected:$success/$processed"\ + "freq:$failure_req fdns:$failure_dns $failure_dns_detailed ftcp:$failure_tcp"\ + "ftls:$failure_tls $failure_tls_detailed f3xx:$failure_3xx fctx:$failure_ctx f???:$failure_qqq" output_file=$out_dir/$relay-l$limit.txt mv "$stdout_file" "$output_file" |