Changeset 31853 for main/trunk

Show
Ignore:
Timestamp:
04.08.2017 19:21:32 (2 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/downloaders/WebDownload.pm

    r31851 r31853  
    115115    } 
    116116    #my $cmdWget = "-N -k -x -t 2 -P \"".$hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions ".$self->{'url'}; 
    117     my $cmdWget = "-N -k -x -t 2 --read-timeout=2 --connect-timeout=2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'};    
     117    my $cmdWget = "-N -k -x -t 2 $strWgetOptions $strOptions $cache_dir " .$self->{'url'};    
    118118 
    119119    #print STDOUT "\n@@@@ RUNNING WGET CMD: $cmdWget\n\n"; 
     
    188188    my $strOptions = $self->getWgetOptions(); 
    189189 
    190     my $strBaseCMD = $strOptions." --timeout=4 --tries=1 -q -O - \"$self->{'url'}\""; 
     190    my $strBaseCMD = $strOptions." -q -O - \"$self->{'url'}\""; 
    191191 
    192192