Changeset 31853

Timestamp:

2017-08-04T19:21:32+12:00 (6 years ago)

Author:

ak19

Message:

Reverting some bad choices when setting wget customisation flags in yesterday's commit 31851. Number of retries and timeouts should not restrict the user, but the very low threshold values set would have done just that. Since we've now decided to keep the wgetrc we're including with Greenstone, users can decide to customise these things there. The 'problematic URL' I'd tested for the last commit was not a non-existent URL as I thought, but a weird special case. Actual non-existent URLs should timeout.

File:

• main/trunk/greenstone2/perllib/downloaders/WebDownload.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 --read-timeout=2 --connect-timeout=2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'};   
+    my $cmdWget = "-N -k -x -t 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." --timeout=4 --tries=1 -q -O - \"$self->{'url'}\"";
+    my $strBaseCMD = $strOptions." -q -O - \"$self->{'url'}\"";