Changeset 17549 for gsdl/trunk/perllib/downloaders/WgetDownload.pm

Timestamp:

2008-10-15T19:53:39+13:00 (16 years ago)

Author:

ak19

Message:

Changes to sudden wget download termination when OAIDownload.pm is used: OAIDownload.pm launches wget several times, one after another (after each previous wget instance has terminated). Therefore when the STOP signal is sent from GLI, the OAIDownload.pm script should stop altogether and issue no more calls to wget. This is now accomplished by checking the new member variable self->force_quit which is set to true when WgetDownload receives a STOP signal from GLI.

File:

• gsdl/trunk/perllib/downloaders/WgetDownload.pm (modified) (5 diffs)

gsdl/trunk/perllib/downloaders/WgetDownload.pm

@@ -96 +96 @@
 sub abrupt_end_handler {
     my $termination_signal = shift (@_);
+
     if(defined $childpid) {
     close($chld_out);
@@ -275 +276 @@
         if($signal eq "<<STOP>>") {
             print $client "Perl received STOP signal (on port $port): stopping wget\n";
-            $loop = 0;
+            $loop = 0;                          # out of outer while loop
+            $self->{'forced_quit'} = 1;         # subclasses need to know we're quitting
             
             # Sometimes the wget process takes some time to start up. If the STOP signal
@@ -301 +303 @@
             }
             }
-            last; # we're done here
+            last;                               # out of foreach loop
         }
         }
@@ -423 +425 @@
         if($signal eq "<<STOP>>") {
             print $client "Perl received STOP signal (on port $port): stopping wget\n";
-            $loop = 0;
+            $loop = 0;                          # out of outer while loop
+            $self->{'forced_quit'} = 1;         # subclasses need to know we're quitting
             
             # Sometimes the wget process takes some time to start up. If the STOP signal
@@ -449 +452 @@
             }
             }
-            last; # we're done here
+            last;                               # out of foreach loop
         }
         }