X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=35e5da7e9bf339aebf3f26e209e6f9e9b262850e;hb=88665a2bed3b9ec9e97237938a95a045b2a21bb4;hp=e6f96aad9c713c9577d53eb367b9e1eed3dab909;hpb=a57ea9d5501f6d319a8cbfff997bad077cc31010;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index e6f96aad..35e5da7e 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -32,8 +32,6 @@ use DXUtil; use IO::File; use Curses; -use Carp qw{cluck}; - use Console; # @@ -104,7 +102,7 @@ sub cease { my $sendz = shift; if ($conn && $sendz) { - $conn->send_now("Z$call|bye...\n"); + $conn->send_now("Z$call|bye..."); } endwin(); dbgclose(); @@ -216,13 +214,18 @@ sub rec_socket cease(1); } if (defined $msg) { - my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/; + my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/; if ($sort && $sort eq 'D') { addtotop($line); } elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away ..... cease(0); } + # ****************************************************** + # ****************************************************** + # any other sorts that might happen are silently ignored. + # ****************************************************** + # ****************************************************** } $top->refresh(); $lasttime = time; @@ -438,9 +441,9 @@ do_initscr(); $SIG{__DIE__} = \&sig_term; -$conn->send_now("A$call|$connsort"); -$conn->send_now("I$call|set/page $maxshist"); -$conn->send_now("I$call|set/nobeep"); +$conn->send_later("A$call|$connsort"); +$conn->send_later("I$call|set/page $maxshist"); +$conn->send_later("I$call|set/nobeep"); Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);