Changeset 17664

Timestamp:

2008-10-31T19:01:20+13:00 (15 years ago)

Author:

ak19

Message:

In the case of OAIDownloads, WgetDownload no longer uses sockets for terminating wget. The original GS2 2.80 did a better job in terminating the multiple wgets launched, by just letting the Java code do a process.destroy() on the perl script which--although it would let the current download finish--would not launch further wget instances.

File:

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

gsdl/trunk/perllib/downloaders/WgetDownload.pm

@@ -188 +188 @@
 }
 
+# Returns true if the wget status needs to be monitored through sockets
+# (if a socket is used to communicate with the Java program on when to
+# terminate wget). True if we are running gli, or if the particular type
+# of WgetDownload is *not* OAIDownload (in that case, the original way of 
+# terminating the perl script from Java terminated wget as well).
+sub dealingWithSockets() {
+    my ($self) = @_;
+    return (defined $self->{'gli'} && $self->{'gli'} && !defined $port && ref($self) ne "OAIDownload");
+                       # use ref($self) to find the classname of an object
+}
+
 sub useWget
 {
@@ -209 +220 @@
     # Instead, when wget has to be terminated in the middle of execution, GLI will
     # connect to a serverSocket here to communicate when it's time to stop wget.
-    if(defined $self->{'gli'} && $self->{'gli'} && !defined $port) {
+    if($self->dealingWithSockets()) {
 
     $port = <STDIN>; # gets a port on localhost that's not yet in use
@@ -336 +347 @@
     # Instead, when wget has to be terminated in the middle of execution, GLI will
     # connect to a serverSocket here to communicate when it's time to stop wget.
-    if(defined $self->{'gli'} && $self->{'gli'} && !defined $port) {
+    if($self->dealingWithSockets()) {
 
     $port = <STDIN>; # gets a port on localhost that's not yet in use