Attachment 610180 Details for Bug 854572 – proposed fix to read both stdout and stderr from fping

[patch] proposed fix to read both stdout and stderr from fping

smokeping-2.4.2-fping33.patch (text/plain), 1.83 KB, created by Charles R. Anderson on 2012-09-06 06:35:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charles R. Anderson

Created: 2012-09-06 06:35:51 UTC

Size: 1.83 KB

patch

obsolete

>diff -up smokeping-2.4.2/lib/Smokeping/probes/FPing.pm.fping33 smokeping-2.4.2/lib/Smokeping/probes/FPing.pm
>--- smokeping-2.4.2/lib/Smokeping/probes/FPing.pm.fping33	2008-06-08 17:49:42.000000000 -0400
>+++ smokeping-2.4.2/lib/Smokeping/probes/FPing.pm	2012-09-06 02:31:14.592525741 -0400
>@@ -112,6 +112,7 @@ sub ping ($){
>     my $inh = gensym;
>     my $outh = gensym;
>     my $errh = gensym;
>+    my $handle = gensym;
>     # pinging nothing is pointless
>     return unless @{$self->addresses};
>     my @params = () ;
>@@ -136,18 +137,20 @@ sub ping ($){
>     $self->do_debug("Executing @cmd");
>     my $pid = open3($inh,$outh,$errh, @cmd);
>     $self->{rtts}={};
>-    while (<$errh>){
>-        chomp;
>-	$self->do_debug("Got fping output: '$_'");
>-        next unless /^\S+\s+:\s+[-\d\.]/; #filter out error messages from fping
>-        my @times = split /\s+/;
>-        my $ip = shift @times;
>-        next unless ':' eq shift @times; #drop the colon
>-        if (($self->{properties}{blazemode} || '') eq 'true'){     
>-             shift @times;
>-        }
>-        @times = map {sprintf "%.10e", $_ / $self->{pingfactor}} sort {$a <=> $b} grep /^\d/, @times;
>-        map { $self->{rtts}{$_} = [@times] } @{$self->{addrlookup}{$ip}} ;
>+    foreach $handle ($outh, $errh) {
>+        while (<$handle>){
>+	    chomp;
>+	    $self->do_debug("Got fping output: '$_'");
>+	    next unless /^\S+\s+:\s+[-\d\.]/; #filter out error messages from fping
>+	    my @times = split /\s+/;
>+	    my $ip = shift @times;
>+	    next unless ':' eq shift @times; #drop the colon
>+	    if (($self->{properties}{blazemode} || '') eq 'true'){     
>+	      shift @times;
>+	    }
>+	    @times = map {sprintf "%.10e", $_ / $self->{pingfactor}} sort {$a <=> $b} grep /^\d/, @times;
>+	    map { $self->{rtts}{$_} = [@times] } @{$self->{addrlookup}{$ip}} ;
>+	}
>     }
>     waitpid $pid,0;
>     close $inh;

Actions: View | Diff

Attachments on bug 854572: 610180