Changeset 3acab0e

Timestamp:

Dec 28, 2009, 12:25:00 AM (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:

416241f

Parents:

54b4a87

git-author:

Nelson Elhage <nelhage@mit.edu> (12/22/09 17:53:48)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/28/09 00:25:00)

Message:

IRC: Store connection objects in %reconnect, rather than timers.

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;
             },
         } );
@@ -329 +333 @@
     BarnOwl::admin_message("IRC", $msg);
     delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+    delete $self->{reconnect_timer};
     $BarnOwl::Module::IRC::ircnets{$self->alias} = $self;
     my $fd = $self->getSocket()->fileno();