Make stoppgn more robust.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index b128e29735b99e7a520d1d31ecec61db0d7cfe40..f383bb6e41088c38c4ba767d47cbb924eacab23c 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -28,9 +28,10 @@ use warnings;
 no warnings qw(once);
 
 # Program starts here
 no warnings qw(once);
 
 # Program starts here

-$SIG{ALRM} = sub { output(); };

 my $latest_update = undef;
 my $latest_update = undef;

+my $output_timer = undef;

 my $http_timer = undef;
 my $http_timer = undef;

+my $stop_pgn_fetch = 0;

 my $tb_retry_timer = undef;
 my %tb_cache = ();
 my $tb_lookup_running = 0;
 my $tb_retry_timer = undef;
 my %tb_cache = ();
 my $tb_lookup_running = 0;


@@ -199,7 +200,6 @@ sub handle_fics {
                };
                if ($@) {
                        warn "Error when getting FICS move history: $@";
                };
                if ($@) {
                        warn "Error when getting FICS move history: $@";

-                       exit;

                        $getting_movelist = 0;
                }
        }
                        $getting_movelist = 0;
                }
        }


@@ -232,6 +232,7 @@ sub handle_fics {
                        fetch_pgn($url);
                } elsif ($msg =~ /^stoppgn$/) {
                        $t->cmd("tell $who Stopping poll.");
                        fetch_pgn($url);
                } elsif ($msg =~ /^stoppgn$/) {
                        $t->cmd("tell $who Stopping poll.");

+                       $stop_pgn_fetch = 1;

                        $http_timer = undef;
                } elsif ($msg =~ /^quit$/) {
                        $t->cmd("tell $who Bye bye.");
                        $http_timer = undef;
                } elsif ($msg =~ /^quit$/) {
                        $t->cmd("tell $who Bye bye.");


@@ -257,6 +258,13 @@ my $pgn_hysteresis_counter = 0;
 
 sub handle_pgn {
        my ($body, $header, $url) = @_;
 
 sub handle_pgn {
        my ($body, $header, $url) = @_;

+
+       if ($stop_pgn_fetch) {
+               $stop_pgn_fetch = 0;
+               $http_timer = undef;
+               return;
+       }
+

        my $pgn = Chess::PGN::Parse->new(undef, $body);
        if (!defined($pgn) || !$pgn->read_game()) {
                warn "Error in parsing PGN from $url\n";
        my $pgn = Chess::PGN::Parse->new(undef, $body);
        if (!defined($pgn) || !$pgn->read_game()) {
                warn "Error in parsing PGN from $url\n";


@@ -478,7 +486,8 @@ sub output {
        # Don't update too often.
        my $age = Time::HiRes::tv_interval($latest_update);
        if ($age < $remoteglotconf::update_max_interval) {
        # Don't update too often.
        my $age = Time::HiRes::tv_interval($latest_update);
        if ($age < $remoteglotconf::update_max_interval) {

-               Time::HiRes::alarm($remoteglotconf::update_max_interval + 0.01 - $age);
+               my $wait = $remoteglotconf::update_max_interval + 0.01 - $age;
+               $output_timer = AnyEvent->timer(after => $wait, cb => \&output);

                return;
        }
        
                return;
        }