Changeset 5118b32 for perl

Timestamp:

Sep 12, 2009, 11:22:14 PM (15 years ago)

Author:

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

Branches:

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

Children:

7967433

Parents:

eea72a13

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (09/12/09 20:54:05)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (09/12/09 23:22:14)

Message:

Switch jabber keep-alive and auto-away to a timer.

Dropping the dependency on the mainloop hook in jabber.
Increasing the keep-alive / auto-away interval in jabber to 5 seconds.

File:

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

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

@@ -70 +70 @@
         register_keybindings();
         register_filters();
-        $BarnOwl::Hooks::mainLoop->add("BarnOwl::Module::Jabber::onMainLoop");
         $BarnOwl::Hooks::getBuddyList->add("BarnOwl::Module::Jabber::onGetBuddyList");
         $BarnOwl::Hooks::getQuickstart->add("BarnOwl::Module::Jabber::onGetQuickstart");
@@ -106 +105 @@
 $BarnOwl::Hooks::startup->add("BarnOwl::Module::Jabber::onStart");
 
-sub onMainLoop {
-    return if ( !$conn->connected() );
+sub do_keep_alive_and_auto_away {
+    if ( !$conn->connected() ) {
+        # We don't need this timer any more.
+        delete $vars{keepAliveTimer};
+        return;
+    }
 
     $vars{status_changed} = 0;
@@ -121 +124 @@
         $vars{status} = 'Auto away after '.$auto_away.' minute'.($auto_away == 1 ? '' : 's').' idle.';
         $vars{status_changed} = 1;
-    } elsif ($idletime == 0 && $vars{show} ne '') {
+    } elsif ($idletime <= $vars{idletime} && $vars{show} ne '') {
         $vars{show} = '';
         $vars{status} = '';
         $vars{status_changed} = 1;
     }
+    $vars{idletime} = $idletime;
 
     foreach my $jid ( $conn->getJIDs() ) {
@@ -134 +138 @@
             BarnOwl::error("Connection for $jid undefined -- error in reload?");
         }
-        # We keep this in the mainloop hook for keep-alives
-        my $status = $client->Process(0);
+        my $status = $client->Process(0); # keep-alive
         if ( !defined($status) ) {
             BarnOwl::error("Jabber account $jid disconnected!");
             do_logout($jid);
+            next;
         }
         if ($::shutdown) {
@@ -450 +454 @@
                     $completion_jids{$buddy->GetJID()} = 1;
                 }
+                $vars{idletime} |= BarnOwl::getidletime();
+                unless (exists $vars{keepAliveTimer}) {
+                    $vars{keepAliveTimer} = BarnOwl::Timer->new({
+                        'after' => 5,
+                        'interval' => 5,
+                        'cb' => sub { BarnOwl::Module::Jabber::do_keep_alive_and_auto_away(@_) }
+                                                                });
+                }
             }
         }