aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRasmus Dahlberg <rasmus@rgdd.se>2023-04-02 21:21:04 +0200
committerRasmus Dahlberg <rasmus@rgdd.se>2023-04-02 22:06:32 +0200
commit816f3da4d3c04cdf6c277e9083238b1377a46c74 (patch)
tree7e8cf77ac385e957a8a49783631604e83d9de44d /scripts
parentad0981749ab82e1401e30a20e8973ce32d30dcf0 (diff)
Annotate (non-)deadline more clearly
Made sense to then split conn errors as well.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/test.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/test.sh b/scripts/test.sh
index 11a3a42..30c46d0 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -55,7 +55,7 @@ function main() {
done
now=$(date +%s)
estimated_done=$(( $now + $runtime_s + $wait_mullvad_s + $wait_onion_grab_s ))
- debug "estimated done? earliest $(date -d @$estimated_done +"%Y-%m-%d %H:%M:%S %Z")"
+ debug "estimated done? approximately $(date -d @$estimated_done +"%Y-%m-%d %H:%M:%S %Z")"
i=1
for limit in ${limits[@]}; do
@@ -105,13 +105,18 @@ function main() {
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_eof=$(grep 'EOF:' "$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-)
+ failure_tcp_detailed=$(grep 'TCP:' "$stderr_file" | tail -n1 | xargs | cut -d' ' -f3-)
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"
+ 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 $failure_tcp_detailed"\
+ "ftls:$failure_tls $failure_tls_detailed"\
+ "f3xx:$failure_3xx feof:$failure_eof fctx:$failure_ctx f???:$failure_qqq"
output_file=$out_dir/$relay-l$limit.txt
mv "$stdout_file" "$output_file"