Changeset a957e92 for perl/modules/Jabber/lib/BarnOwl/Module/Jabber.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.pm (modified) (5 diffs)

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

@@ -132 +132 @@
 
     foreach my $jid ( $conn->getJIDs() ) {
+
+        next unless $conn->jidActive($jid) or $conn->tryReconnect($jid);
+
         my $client = $conn->getConnectionFromJID($jid);
-
         unless($client) {
             $conn->removeConnection($jid);
@@ -140 +142 @@
         my $status = $client->Process(0); # keep-alive
         if ( !defined($status) ) {
-            BarnOwl::error("Jabber account $jid disconnected!");
-            do_logout($jid);
-            next;
+            $conn->scheduleReconnect($jid);
         }
         if ($::shutdown) {
@@ -383 +383 @@
     }
 
-    if ( $conn->jidExists($jidStr) ) {
+    if ( $conn->jidActive($jidStr) ) {
         BarnOwl::error("Already logged in as $jidStr.");
         return;
+    } elsif ($conn->jidExists($jidStr)) {
+        return $conn->tryReconnect($jidStr, 1);
     }
 
@@ -453 +455 @@
                 BarnOwl::error( "Error in connect: " . join( " ", @result ) );
             } else {
+                $conn->setAuth(
+                    $jidStr,
+                    {   %{ $vars{jlogin_authhash} },
+                        password => $vars{jlogin_password}
+                    }
+                );
                 my $roster = $conn->getRosterFromJID($jidStr);
                 $roster->fetch();
@@ -463 +471 @@
                 $client->{fileno} = $client->getSocket()->fileno();
                 #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
-                BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess() });
+                BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess($fullJid) });
 
                 # populate completion from roster.