Changeset 814aca1 for perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

Timestamp:

Dec 30, 2009, 2:12:15 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

901b931

Parents:

85fa6e4 (diff), d41f773 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'release-1.5'

File:

• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (3 diffs)

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

@@ -23 +23 @@
 
 use BarnOwl;
+use Scalar::Util qw(weaken);
 
 BEGIN {
@@ -315 +316 @@
     my $interval = shift || 5;
     delete $BarnOwl::Module::IRC::ircnets{$self->alias};
-    $BarnOwl::Module::IRC::reconnect{$self->alias} =
+    $BarnOwl::Module::IRC::reconnect{$self->alias} = $self;
+    my $weak = $self;
+    weaken($weak);
+    $self->{reconnect_timer} = 
         BarnOwl::Timer->new( {
             after => $interval,
             cb    => sub {
-                $self->reconnect( $interval );
+                $weak->reconnect( $interval ) if $weak;
             },
         } );
-    $BarnOwl::Module::IRC::reconnect{$self->alias}{conn} = $self;
+}
+
+sub cancel_reconnect {
+    my $self = shift;
+    delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+    delete $self->{reconnect_timer};
 }
 
@@ -329 +338 @@
     my $msg = shift;
     BarnOwl::admin_message("IRC", $msg);
-    delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+    $self->cancel_reconnect;
     $BarnOwl::Module::IRC::ircnets{$self->alias} = $self;
     my $fd = $self->getSocket()->fileno();