Changeset 9627

Timestamp:

12/12/09 04:41:44 (2 years ago)

Author:

submersible_toaster

Message:

[Padre-Plugin-Swarm] tidy up the service shutdown process

Location:

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm

Files:

• Service/Chat.pm (modified) (5 diffs)
• Transport/Multicast.pm (modified) (1 diff)

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Service/Chat.pm

@@ -17 +17 @@
 use Padre::Swarm::Transport::Multicast ();
 use Padre::Util;
-use Data::Dumper;
 our $VERSION = '0.05';
 our @ISA     = 'Padre::Swarm::Service';
+
 
 use Class::XSAccessor
@@ -115 +115 @@
         my $self = shift;
         TRACE( 'Requested shutdown of service' ) if DEBUG;
-        warn "SHUTDOWN " , Dumper $self;
+        return unless $self->running;
+        $self->send( 
+          Padre::Swarm::Message->new(
+            type => 'leave', 
+          )
+        );
         
         return unless $self->running;
@@ -121 +126 @@
 }
 
+use Carp qw( cluck );
 sub hangup {
     my ($self,$running) = @_;
-    $self->transport->shutdown;
+    $self->shutdown;
     $$running = 0;
 }
@@ -129 +135 @@
 sub terminate {
     my ($self,$running) = @_;
-    $self->transport->shutdown;
+    $self->shutdown;
     $$running = 0;
 }
@@ -201 +207 @@
     
     if ( $type eq 'disco' ) {
-        #warn "DISCO recv";
         $self->promote($message);
     }

trunk/Padre-Plugin-Swarm/lib/Padre/Swarm/Transport/Multicast.pm

@@ -65 +65 @@
     $self->{client}->mcast_drop( MCAST_GROUP );
     $self->{client}->shutdown(0);
+    delete $self->{client};
     
     $self->started(0);