X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fclient.pl;h=a5caec450e67b922eeeb7b9807fa8d56d92448da;hb=f77b59f4fcceb428142461972e94345419cbda28;hp=f7912ad791139d13532759e0971642d7f0ff768a;hpb=60c0ea1747bc8ad95e531d29025f7bcee4fd10c1;p=spider.git diff --git a/perl/client.pl b/perl/client.pl index f7912ad7..a5caec45 100755 --- a/perl/client.pl +++ b/perl/client.pl @@ -51,12 +51,12 @@ sub rec_socket cease(1); } if (defined $msg) { - my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)|(.*)$/; + my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/; if ($sort eq 'D') { $nl = "" if $mode == 0; - $line =~ s/\n/\r/o if $mode == 1; - print $line, $nl; + $line =~ s/\n/\r/og if $mode == 1; + print $line; } elsif ($sort eq 'M') { $mode = $line; # set new mode from cluster } elsif ($sort eq 'Z') { # end, disconnect, go, away ..... @@ -78,7 +78,7 @@ sub rec_stdin # print "sys: $r $buf"; if ($r > 0) { if ($mode) { - $buf =~ s/\r/\n/o if $mode == 1; + $buf =~ s/\r/\n/og if $mode == 1; $dangle = !($buf =~ /\n$/); @lines = split /\n/, $buf; if ($dangle) { # pull off any dangly bits @@ -113,7 +113,7 @@ select STDOUT; $| = 1; $SIG{'INT'} = \&sig_term; $SIG{'TERM'} = \&sig_term; -#$SIG{'HUP'} = \&sig_term; +$SIG{'HUP'} = \&sig_term; $conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket); $conn->send_now("A$call|start");