Changeset 3713b86 for perl

Timestamp:

Apr 3, 2011, 3:06:01 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

5d4262c

Parents:

59425a3

git-author:

Nelson Elhage <nelhage@mit.edu> (02/26/11 20:43:58)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/03/11 15:06:01)

Message:

IRC: Remove the %reconnect hash.

Keep everything in the %ircnets hash, always. This should hopefully help fix
some really confusing bugs where we get multiple connections that think they
have the same alias.

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

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

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

@@ -31 +31 @@
 our %ircnets;
 our %channels;
-our %reconnect;
 
 sub startup {
@@ -398 +397 @@
     if ($conn->conn->{socket}) {
         $conn->conn->disconnect("Goodbye!");
-    } elsif ($reconnect{$conn->alias}) {
+    } elsif ($conn->{reconnect_timer}) {
         BarnOwl::admin_message('IRC',
                                "[" . $conn->alias . "] Reconnect cancelled");
         $conn->cancel_reconnect;
+        delete $ircnets{$conn->alias};
     }
 }
@@ -620 +620 @@
     my $allow_disconnected = shift;
 
-    return $ircnets{$key} if exists $ircnets{$key};
-    return $reconnect{$key} if $allow_disconnected && exists $reconnect{$key};
-    die("No such ircnet: $key\n")
+    my $conn = $ircnets{$key};
+    die("No such ircnet: $key\n") unless $conn;
+    if ($conn->conn->{registered} || $allow_disconnected) {
+        return $conn;
+    }
+    die("[@{[$conn->alias]}] Not currently connected.");
 }
 

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

@@ -379 +379 @@
     my $self = shift;
     my $interval = shift || 5;
-    $BarnOwl::Module::IRC::reconnect{$self->alias} = $self;
+
     my $weak = $self;
     weaken($weak);
@@ -397 +397 @@
 sub cancel_reconnect {
     my $self = shift;
-    delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+
     if (defined $self->{reconnect_timer}) {
         $self->{reconnect_timer}->stop;