Changeset c8d9f84

Timestamp:

Sep 25, 2010, 10:26:08 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

e75a6df

Parents:

b120bd3

git-author:

David Benjamin <davidben@mit.edu> (09/24/10 17:34:51)

git-committer:

David Benjamin <davidben@mit.edu> (09/25/10 22:26:08)

Message:

More aggressively stop Timers created in perl

In case something leaks with references or whatever, at least we don't
leak timers.

Location:

perl

Files:

• lib/BarnOwl/MainLoopCompatHook.pm (modified) (1 diff)
• modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (2 diffs)
• modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)
• modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (1 diff)

perl/lib/BarnOwl/MainLoopCompatHook.pm

@@ -37 +37 @@
 }
 
+sub DESTROY {
+    my $self = shift;
+    $self->clear();
+}
+
 sub _ensure_timer {
   my $self = shift;

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

@@ -319 +319 @@
     my $weak = $self;
     weaken($weak);
+    if (defined $self->{reconnect_timer}) {
+        $self->{reconnect_timer}->stop;
+    }
     $self->{reconnect_timer} = 
         BarnOwl::Timer->new( {
@@ -331 +334 @@
     my $self = shift;
     delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+    if (defined $self->{reconnect_timer}) {
+        $self->{reconnect_timer}->stop;
+    }
     delete $self->{reconnect_timer};
 }

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

@@ -112 +112 @@
     if ( !$conn->connected() ) {
         # We don't need this timer any more.
+        if (defined $vars{keepAliveTimer}) {
+            $vars{keepAliveTimer}->stop;
+        }
         delete $vars{keepAliveTimer};
         return;

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

@@ -149 +149 @@
     my $weak = $self;
     weaken($weak);
+
+    # Stop any existing timers.
+    if (defined $self->{timer}) {
+        $self->{timer}->stop;
+        $self->{timer} = undef;
+    }
+    if (defined $self->{direct_timer}) {
+        $self->{direct_timer}->stop;
+        $self->{direct_timer} = undef;
+    }
 
     if($self->{cfg}->{poll_for_tweets}) {