Changeset 3b4ba7d

Timestamp:

Dec 15, 2009, 12:03:05 AM (14 years ago)

Author:

Alex Vandiver <alexmv@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

cd12307

Parents:

62c91c1

git-author:

Alex Vandiver <alexmv@mit.edu> (12/12/09 00:25:49)

git-committer:

Alex Vandiver <alexmv@mit.edu> (12/15/09 00:03:05)

Message:

Reconnect and re-join channels on IRC disconnect

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

• IRC.pm (modified) (3 diffs)
• IRC/Connection.pm (modified) (10 diffs)

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -30 +30 @@
 our %ircnets;
 our %channels;
+our %reconnect;
 
 sub startup {
@@ -378 +379 @@
 
     if ($conn->conn->connected) {
-        BarnOwl::admin_message("IRC", "Connected to $alias as $nick");
-        $ircnets{$alias} = $conn;
-        my $fd = $conn->getSocket()->fileno();
-        BarnOwl::add_io_dispatch($fd, 'r', \&OwlProcess);
-        $conn->{FD} = $fd;
+        $conn->connected("Connected to $alias as $nick");
     } else {
         die("IRC::Connection->connect failed: $!");
@@ -394 +391 @@
     my $conn = shift;
     $conn->conn->disconnect;
-    delete $ircnets{$conn->alias};
     return;
 }

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -3 +3 @@
 
 package BarnOwl::Module::IRC::Connection;
+use BarnOwl::Timer;
 
 =head1 NAME
@@ -18 +19 @@
 
 use base qw(Class::Accessor Exporter);
-__PACKAGE__->mk_accessors(qw(conn alias channels connected motd names_tmp whois_tmp));
+__PACKAGE__->mk_accessors(qw(conn alias channels motd names_tmp whois_tmp));
 our @EXPORT_OK = qw(&is_private);
 
@@ -44 +45 @@
     $self->channels([]);
     $self->motd("");
-    $self->connected(0);
     $self->names_tmp(0);
     $self->whois_tmp("");
 
-    $self->conn->add_handler(376 => sub { shift; $self->on_connect(@_) });
     $self->conn->add_default_handler(sub { shift; $self->on_event(@_) });
     $self->conn->add_handler(['msg', 'notice', 'public', 'caction'],
@@ -151 +150 @@
     my ($self, $evt) = @_;
     $self->motd(join "\n", $self->motd, cdr($evt->args));
-    if(!$self->connected) {
-        BarnOwl::admin_message("IRC", "Connected to " .
-                               $self->server . " (" . $self->alias . ")");
-        $self->connected(1);
-        
-    }
     BarnOwl::admin_message("IRC",
             BarnOwl::Style::boldify('MOTD for ' . $self->alias) . "\n"
@@ -172 +165 @@
         );
     BarnOwl::queue_message($msg);
+    push @{$self->channels}, $evt->to;
 }
 
@@ -184 +178 @@
         );
     BarnOwl::queue_message($msg);
+    $self->channels([ grep {$_ ne $evt->to} @{$self->channels}]);
 }
 
@@ -199 +194 @@
 }
 
-sub on_disconnect {
+sub disconnect {
     my $self = shift;
     delete $BarnOwl::Module::IRC::ircnets{$self->alias};
@@ -211 +206 @@
     }
     BarnOwl::remove_io_dispatch($self->{FD});
+    $self->motd("");
+}
+
+sub on_disconnect {
+    my ($self, $evt) = @_;
+    $self->disconnect;
     BarnOwl::admin_message('IRC',
                            "[" . $self->alias . "] Disconnected from server");
+    if ($evt->format and $evt->format eq "error") {
+        $self->schedule_reconnect;
+    } else {
+        $self->channels([]);
+    }
 }
 
@@ -220 +226 @@
                            "[" . $self->alias . "] " .
                            [$evt->args]->[1] . ": Nick already in use");
-    unless($self->connected) {
-        $self->conn->disconnect;
-    }
+    $self->disconnect unless $self->motd;
 }
 
@@ -304 +308 @@
             . strip_irc_formatting(join("\n", $evt->args)))
         if BarnOwl::getvar('irc:spew') eq 'on';
+}
+
+sub schedule_reconnect {
+    my $self = shift;
+    my $interval = shift || 5;
+    delete $BarnOwl::Module::IRC::ircnets{$self->alias};
+    $BarnOwl::Module::IRC::reconnect{$self->alias} =
+        BarnOwl::Timer->new( {
+            after => $interval,
+            cb    => sub {
+                $self->reconnect( $interval );
+            },
+        } );
+}
+
+sub connected {
+    my $self = shift;
+    my $msg = shift;
+    BarnOwl::admin_message("IRC", $msg);
+    delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+    $BarnOwl::Module::IRC::ircnets{$self->alias} = $self;
+    my $fd = $self->getSocket()->fileno();
+    BarnOwl::add_io_dispatch($fd, 'r', \&BarnOwl::Module::IRC::OwlProcess);
+    $self->{FD} = $fd;
+}
+
+sub reconnect {
+    my $self = shift;
+    my $backoff = shift;
+
+    $self->conn->connect;
+    if ($self->conn->connected) {
+        $self->connected("Reconnected to ".$self->alias);
+        my @channels = @{$self->channels};
+        $self->channels([]);
+        $self->conn->join($_) for @channels;
+        return;
+    }
+
+    $backoff *= 2;
+    $backoff = 60*5 if $backoff > 60*5;
+    $self->schedule_reconnect( $backoff );
 }