Changeset 17548

Timestamp:

2008-10-15T18:07:39+13:00 (16 years ago)

Author:

ak19

Message:

Takes the latest changes to WgetDownload.pm into account: useWget waits for wget to launch before terminating it upon receiving the STOP message from GLI and will return a message once it has finally been able to kill wget. Based on whether this message was received, DownloadJob will decide whether to kill the perl process (otherwise it may have to wait for it to terminate naturally).

File:

• gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (4 diffs)

gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -446 +446 @@
         }
         if(state == STOPPED) {
+        boolean terminatePerlScript = true;
+
         // When GLI is working with wget-based download modes (OAI, MediaWiki and Web download)
         // and the STOP button has been pressed, wget needs to be prematurely terminated.
@@ -469 +471 @@
                 System.err.println("GLI sent STOP signal to perl to terminate wget." 
                            + "\nGot response from perl: " + response);
+
+                response = clientReader.readLine(); // see whether the perl script is ready to be terminated
+                System.err.println("Got another response from perl: " + response);
                 os.close();
                 
@@ -475 +480 @@
                 clientReader = null;
                 clientSocket = null;
+                
+                if(response == null) {
+                terminatePerlScript = false;
+                }
             } catch(IOException ex) {
                 System.err.println("Tried to communicate through client socket - port " + this.port + ", but got exception: " + ex);
@@ -485 +494 @@
         //prcs.getInputStream().close();
         prcs.getErrorStream().close();
-        prcs.destroy(); // This doesn't always work, but it's worth a try       
-        prcs = null;
+        if(terminatePerlScript) {
+            prcs.destroy(); // This doesn't always work, but it's worth a try       
+            prcs = null;
+        }
         br.close();
         br = null;