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

Timestamp:

Dec 22, 2009, 6:37:38 PM (14 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

a2a5236

Parents:

6396c1e

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (12/22/09 01:15:39)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (12/22/09 18:37:38)

Message:

Factor out some common jabber connect-time code

Call it upon successful connection and reconnection.

File:

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

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

@@ -85 +85 @@
     $self->{$jidStr}->{ReconnectAt} = time + $self->{$jidStr}->{ReconnectBackoff};
 
-    my $status = $self->{$jidStr}->{Client}->Connect;
+    my $client = $self->{$jidStr}->{Client};
+    my $status = $client->Connect;
     return 0 unless $status;
 
-    my @result = $self->{$jidStr}->{Client}->AuthSend( %{ $self->{$jidStr}->{Auth} } );
+    my @result = $client->AuthSend( %{ $self->{$jidStr}->{Auth} } );
     if ( !@result || $result[0] ne 'ok' ) {
         $self->removeConnection($jidStr);
@@ -94 +95 @@
         return 0;
     }
-
-    BarnOwl::admin_message(Jabber => "Reconnected to jabber as $jidStr");
-    $self->{$jidStr}{Status} = "available";
-
-    foreach my $muc ($self->{$jidStr}->{Client}->MUCs()) {
+    $self->{$jidStr}->{Status} = "available";
+    $client->onConnect($self, $jidStr);
+    foreach my $muc ($client->MUCs()) {
         $muc->Join($muc->{ARGS});
     }