Commit f3f17806 authored by Mike Hibler's avatar Mike Hibler
Browse files

Merge branch 'master' into root-keypair-r1

parents c6150425 66781988
......@@ -373,15 +373,15 @@ sub reportevents($)
push(@mailbody,
"Thresholds: $MAX_PPS pkts/sec, $mbps Mbits/sec\n");
push(@mailbody,
sprintf("%10s %14s %14s %s",
"Node", "Pkts/sec", "Mb/sec", "When"));
sprintf("%10s %20s %8s %8s %s",
"Node", "Expt", "Pkts/sec", "Mb/sec", "When"));
}
my $stamp = POSIX::strftime("20%y-%m-%d %H:%M:%S",
localtime($ref->{'start'}));
push(@mailbody,
sprintf("%10s %14d %14d %s for %d sec",
$node, $pps, int($bps/1000000),
$stamp, $secs));
sprintf("%10s %20s %8d %8d %s for %d sec",
$node, $pcs{$node}{'exp'}, $pps,
int($bps/1000000), $stamp, $secs));
}
}
$rates{$node}{'pkts'} = 0;
......
......@@ -897,7 +897,7 @@ sub FetchMetadata($)
my $safe_url = User::escapeshellarg($url);
my $opts = ($debug ? "" : "-q");
my $cmd = "$WGET $opts --no-check-certificate -O - $safe_url ";
$cmd .= "| $DD bs=1 count=5k ";
$cmd .= "| $DD 2>/dev/null bs=1 count=5k ";
if ($debug) {
print "$cmd\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment