Changeset 658421f for perl/modules/IRC/lib/BarnOwl/Module

Timestamp:

Apr 13, 2017, 6:43:22 PM (7 years ago)

Author:

GitHub <noreply@github.com>

Parents:

678a7650 (diff), 5405fb1 (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.

git-author:

tehmoth <james2vegas@aim.com> (04/13/17 18:43:22)

git-committer:

GitHub <noreply@github.com> (04/13/17 18:43:22)

Message:

Merge 5405fb1f18db895edf58a681a236bef64d9715e2 into 678a7650cf7595dcc43c5e1a0422b6d965b67136

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

• IRC.pm (modified) (1 diff)
• IRC/Connection.pm (modified) (2 diffs)

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

@@ -562 +562 @@
                                "[" . $conn->alias . "] Reconnect cancelled");
         $conn->cancel_reconnect;
+        delete $ircnets{$conn->alias};
+    } elsif (exists $ircnets{$conn->alias}) { # inconsistent state; no socket, but not yet deleted
+        BarnOwl::admin_message('IRC',
+                               "[" . $conn->alias . "] Attempt to disconnect from a socketless connection; deleting it");
         delete $ircnets{$conn->alias};
     }

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

@@ -437 +437 @@
 }
 
+sub rejoin_channels {
+    my $self = shift;
+    my @channels = @_;
+    # As reported in https://barnowl.mit.edu/ticket/274, if we reconnect to
+    # too many at once, the server rejects us.  Empirically, this is about
+    # 20-26, so we set the cap at 15, then delay further joins for 5 seconds.
+    my $MAX_RECONNECT_CHANNELS = 15;
+    my $DELAY = 5;
+    foreach my $c (@channels[ 0 .. $MAX_RECONNECT_CHANNELS ]) {
+        $self->conn->send_msg(join => $c);
+    }
+    if ($MAX_RECONNECT_CHANNELS < $#channels) {
+        my $remaining = $#channels - $MAX_RECONNECT_CHANNELS;
+        my $cur_alias = $self->alias;
+        BarnOwl::admin_message('IRC', "[$cur_alias] Delaying $remaining autorejoins for $DELAY seconds");
+        # if we don't assign the timer to anything, then it gets garbage
+        # collected, and never runs
+        $self->{autoconnect_channels_delay_timer} = BarnOwl::Timer->new({
+            name  => "IRC rejoin overflow timer ($remaining remaining)",
+            after => $DELAY,
+            cb    => sub {
+                rejoin_channels($self, @channels[ $MAX_RECONNECT_CHANNELS .. $#channels ]);
+            }
+        });
+    }
+}
+
+
 sub connected {
     my $self = shift;
@@ -443 +471 @@
     $self->cancel_reconnect;
     if ($self->autoconnect_channels) {
-        for my $c (@{$self->autoconnect_channels}) {
-            $self->conn->send_msg(join => $c);
-        }
+        rejoin_channels($self, @{$self->autoconnect_channels});
     }
     $self->conn->enable_ping(60, sub {