Changeset 31856

Timestamp:

2017-08-07T19:09:21+12:00 (6 years ago)

Author:

ak19

Message:

If the proxy settings are wrong or set when not needed, pressing the Server Information button would take forever (freeze GLI GUI), and the wget that java launched through perl would also take forever, blocking. The wget will have to be terminated from Task Manager. To overcome issues of network settings misconfigurations, which Dr Bainbridge said are hard to detect, setting the number of tries on pressing the Server Info button to 2. The number of tries for pressing the Download button were already 2, so this just makes the two wget commands issued more similar (but the wget launched by the Download button now uses the --tries=2 rather than the shorthand -t 2 too, so that the code reads better). Setting the number of wget retries launched by the Server Info Dialog also ensures wget is eventually terminated, as happens when both tries fail. Some more informative messages are now displayed if the server is unavaiable, depending on whether proxying is on or not.

Location:

main/trunk/greenstone2/perllib/downloaders

Files:

• WebDownload.pm (modified) (3 diffs)
• WgetDownload.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

@@ -115 +115 @@
     }
     #my $cmdWget = "-N -k -x -t 2 -P \"".$hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions ".$self->{'url'};
-    my $cmdWget = "-N -k -x -t 2  $strWgetOptions $strOptions $cache_dir " .$self->{'url'};   
+    my $cmdWget = "-N -k -x --tries=2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'};
 
     #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n";
@@ -188 +188 @@
     my $strOptions = $self->getWgetOptions();
 
-    my $strBaseCMD = $strOptions." -q -O - \"$self->{'url'}\"";
+    my $strBaseCMD = $strOptions." --tries=2 -q -O - \"$self->{'url'}\"";
 
   
@@ -194 +194 @@
     
     if (!defined $strIdentifyText or $strIdentifyText eq ""  ){
-    print STDERR "Server information is unavailable.\n";
-    print STDERR "<<Finished>>\n";
+        print STDERR "Server information is unavailable.\n";            
+        if ($self->{'proxy_on'} && $self->{'proxy_host'} && $self->{'proxy_port'}) { # if proxying set, the settings may be wrong
+            print STDERR "Current proxy settings are:\n";
+            print STDERR "- host=$self->{'proxy_host'}\n";
+            print STDERR "- port=$self->{'proxy_port'}\n";
+        } else { # else no proxy set, the user may need proxy settings
+            prin STDERR "The external server might not be responding, or you might need to switch on proxy settings.\n";
+        }
+        print STDERR "<<Finished>>\n";
          return;  
     }

main/trunk/greenstone2/perllib/downloaders/WgetDownload.pm

@@ -263 +263 @@
     # closing an extra unused handle, a single handle is used instead for both the child's
     # stderr and stdout.
+    # See http://blog.0x1fff.com/2009/09/howto-execute-system-commands-in-perl.html
+    # for why this is the right thing to do.
 
     # Both open2 and open3 don't return on failure, but raise an exception. The handling
@@ -284 +286 @@
         }
         $strReadIn .= $strLine;
-    } 
+    }
     else { # wget finished, terminate naturally
         #print STDOUT "\nPerl: open2 command, input stream closed. Wget terminated naturally.\n";