Changeset a957e92 for perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

Timestamp:

Oct 18, 2009, 3:59:29 PM (15 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:

f3678c3

Parents:

99cc3dc

git-author:

Alex Vandiver <alexmv@mit.edu> (03/22/09 02:06:46)

git-committer:

Alex Vandiver <alexmv@mit.edu> (10/18/09 15:59:29)

Message:

Make Jabber try to reconnect when disconnected, at exponential intervals

Make the ConnectionManager store auth information on connect, and use
that auth information to try to reconnect and re-auth.  Use some
simple exponential backoff, capped at 5 minutes, as intervals for
reconnecting.

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (4 diffs)

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

@@ -41 +41 @@
       if $self->{$jidStr}->{Client};
     delete $self->{$jidStr};
+
+    return 1;
+}
+
+sub scheduleReconnect {
+    my $self = shift;
+    my $jidStr = shift;
+    return 0 unless exists $self->{$jidStr};
+    BarnOwl::admin_message(Jabber => "Disconnected from jabber account $jidStr");
+
+    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
+    $self->{$jidStr}->{Client}->Disconnect()
+      if $self->{$jidStr}->{Client};
+
+    $self->{$jidStr}->{Status} = "reconnecting";
+    $self->{$jidStr}->{ReconnectBackoff} = 5;
+    $self->{$jidStr}->{ReconnectAt} = time + $self->{$jidStr}->{ReconnectBackoff};
+    return 1;
+}
+
+sub setAuth {
+    my $self = shift;
+    my $jidStr = shift;
+    $self->{$jidStr}->{Auth} = shift;
+}
+
+sub tryReconnect {
+    my $self = shift;
+    my $jidStr = shift;
+    my $force = shift;
+
+    return 0 unless exists $self->{$jidStr};
+    return 0 unless $self->{$jidStr}{Status} eq "reconnecting";
+    return 0 unless $force or (time > $self->{$jidStr}{ReconnectAt});
+
+    $self->{$jidStr}->{ReconnectBackoff} *= 2;
+    $self->{$jidStr}->{ReconnectBackoff} = 60*5
+        if $self->{$jidStr}->{ReconnectBackoff} > 60*5;
+    $self->{$jidStr}->{ReconnectAt} = time + $self->{$jidStr}->{ReconnectBackoff};
+
+    my $status = $self->{$jidStr}->{Client}->Connect;
+    return 0 unless $status;
+
+    my @result = $self->{$jidStr}->{Client}->AuthSend( %{ $self->{$jidStr}->{Auth} } );
+    if ( !@result || $result[0] ne 'ok' ) {
+        $self->removeConnection($jidStr);
+        BarnOwl::error( "Error in jabber reconnect: " . join( " ", @result ) );
+        return 0;
+    }
+
+    BarnOwl::admin_message(Jabber => "Reconnected to jabber as $jidStr");
+    $self->{$jidStr}{Status} = "available";
 
     return 1;
@@ -88 +140 @@
 }
 
+sub jidActive {
+    my $self = shift;
+    my $jidStr = shift;
+    return(exists $self->{$jidStr} and $self->{$jidStr}{Status} eq "available");
+}
+
 sub sidExists {
     my $self = shift;
@@ -110 +168 @@
     my $jid = shift;
     $jid = $jid->GetJID('full') if UNIVERSAL::isa($jid, 'Net::XMPP::JID');
-    return $self->{$jid}->{Client} if exists $self->{$jid};
+    return $self->{$jid}->{Client} if $self->jidActive($jid);
 }
 
@@ -127 +185 @@
     my $jid = shift;
     $jid = $jid->GetJID('full') if UNIVERSAL::isa($jid, 'Net::XMPP::JID');
-    return $self->{$jid}->{Roster} if exists $self->{$jid};
+    return $self->{$jid}->{Roster} if $self->jidExists($jid);
 }