hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 07:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix console.pl so it ends gracefully

Browse Source
This commit is contained in:
Dirk Koopman 2011-12-22 22:42:15 +00:00
parent bbc51ffb41
commit 6e858487b4
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bye.pl
View File

@ -13,7 +13,7 @@ if ($self->is_user && -e "$main::data/logout") {
my @in = <I>;
close(I);
$self->send_now('D', @in);
Msg->sleep(1);
# Msg->sleep(1);
}
#$self->send_now('Z', "");

7
perl/Msg.pm
View File

@ -61,6 +61,13 @@ sub set_error
$conn->{eproc} = $callback;
}
sub set_eof
{
my $conn = shift;
my $callback = shift;
$conn->{sock}->on_eof(sub {$callback});
}
sub set_rproc
{
my $conn = shift;

4
perl/Version.pm
View File

@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
$version = '1.56';
$subversion = '0';
$build = '2';
$gitversion = '38aa5af';
$build = '3';
$gitversion = 'bbc51ff';
1;

29
perl/console.pl
View File

@ -71,6 +71,7 @@ my @time = ();
my $lastmin = 0;
my $sigint;
my $sigterm;
my $decease;
#$SIG{WINCH} = sub {@time = gettimeofday};
@ -140,13 +141,23 @@ sub do_resize
show_screen();
}
my $ceasing = 0;
# cease communications
sub cease
{
my $sendz = shift;
print "ceasing ($ceasing)\r\n";
return if $ceasing;
++$ceasing;
$conn->disconnect if $conn;
endwin();
dbgclose();
endwin();
$decease->send;
print @_ if @_;
exit(0);
}
@ -505,6 +516,9 @@ if ($call eq $main::mycall) {
exit(0);
}
# create end condvar
$decease = AnyEvent->condvar;
dbginit();
$conn = IntMsg->connect("$main::clusteraddr", $main::clusterport, \&rec_socket);
@ -521,22 +535,22 @@ if (! $conn) {
exit(0);
}
# create end condvar
my $decease = AnyEvent->condvar;
$conn->set_error(sub{cease(0)});
unless ($DB::VERSION) {
$sigint = AnyEvent->signal(signal=>'INT', cb=> sub{$decease->send});
$sigterm = AnyEvent->signal(signal=>'TERM', cb=> sub{$decease->send});
}
$SIG{'HUP'} = \&sig_term;
#$SIG{'HUP'} = \&sig_term;
my $sighup = AnyEvent->signal(signal=>'HUP', cb=> sub{$decease->send});
$conn->{sock}->on_eof(sub{$decease->send});
$conn->{sock}->on_error(sub{$decease->send});
# start up
do_resize();
$SIG{__DIE__} = \&sig_term;
#$SIG{__DIE__} = \&sig_term;
#my $sigdie = AnyEvent->signal(signal=>'__DIE__', cb=> sub{$decease->send});
$conn->send_later("A$call|$connsort width=$cols");
$conn->send_later("I$call|set/page $maxshist");
@ -551,4 +565,3 @@ my $event_loop = AnyEvent->timer(after => 0, interval => 0.010, cb => sub{idle_
$decease->recv;
cease(0);
exit(0);