/[pdpsoft]/nl.nikhef.pdp.fetchcrl/trunk/TrustAnchor.pm
ViewVC logotype

Diff of /nl.nikhef.pdp.fetchcrl/trunk/TrustAnchor.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2783 by davidg, Thu Apr 30 10:44:41 2015 UTC revision 3178 by davidg, Tue Apr 11 07:16:27 2017 UTC
# Line 112  sub loadAnchor($$) { Line 112  sub loadAnchor($$) {
112      @{$self->{"crlurls"}} = ();      @{$self->{"crlurls"}} = ();
113      open CRLURL,"$path$basename$suffix" or      open CRLURL,"$path$basename$suffix" or
114        $::log->err("Error reading crl_url $path$basename$suffix: $!") and return 0;        $::log->err("Error reading crl_url $path$basename$suffix: $!") and return 0;
115        $self->{"filename"} = "$path$basename$suffix";
116      my $urllist;      my $urllist;
117      while (<CRLURL>) {      while (<CRLURL>) {
118        /^\s*([^#\n]+).*$/ and my $url = $1 or next;        /^\s*([^#\n]+).*$/ and my $url = $1 or next;
# Line 134  sub loadAnchor($$) { Line 135  sub loadAnchor($$) {
135      $info->read( $path . $basename . $suffix ) or      $info->read( $path . $basename . $suffix ) or
136        $::log->err("Error reading info $path$basename$suffix", $info->errstr)        $::log->err("Error reading info $path$basename$suffix", $info->errstr)
137          and return 0;          and return 0;
138        $self->{"filename"} = "$path$basename$suffix";
139    
140      $info->{_}->{"crl_url"} and $info->{_}->{"crl_url.0"} and      $info->{_}->{"crl_url"} and $info->{_}->{"crl_url.0"} and
141        $::log->err("Invalid info for $basename: crl_url and .0 duplicate") and        $::log->err("Invalid info for $basename: crl_url and .0 duplicate") and
# Line 433  sub retrieveHTTP($$) { Line 435  sub retrieveHTTP($$) {
435        $ua->proxy("http", $self->{"http_proxy"});        $ua->proxy("http", $self->{"http_proxy"});
436      }      }
437    }    }
438      # set request cache control if specified as valid in config
439      if ( defined $::cnf->{_}->{cache_control_request} ) {
440        $::log->verb(5,"Setting request cache-control to ".
441                       $::cnf->{_}->{cache_control_request});
442        if ( $::cnf->{_}->{cache_control_request} =~ /^\d+$/ ) {
443          $ua->default_header('Cache-control' =>
444                              "max-age=".$::cnf->{_}->{cache_control_request} );
445        } else {
446          die "Request cache control is invalid (not a number)\n";
447        }
448      }
449    
450    # see with a HEAD request if we can get by with old data    # see with a HEAD request if we can get by with old data
451    # but to assess that we need Last-Modified from the previous request    # but to assess that we need Last-Modified from the previous request
# Line 454  sub retrieveHTTP($$) { Line 466  sub retrieveHTTP($$) {
466      alarm 0; # make sure the alarm stops ticking, regardless of the eval      alarm 0; # make sure the alarm stops ticking, regardless of the eval
467    
468      if ( $@ ) { # died, alarm hit: server bad, so try next URL      if ( $@ ) { # died, alarm hit: server bad, so try next URL
469        $::log->verb(2,"HEAD error $url:", $@);        chomp($@);
470          my $shorterror = $@; $shorterror =~ s/\n.*$//gs;
471          $::log->verb(2,"HEAD error $url:", $shorterror);
472          # underlying socket library may be verybose - filter and qualify messages
473          if ( $shorterror ne $@ ) {
474            foreach my $errorline ( split(/\n/,$@) ) {
475              chomp($errorline); $errorline eq $shorterror and next; # nodups
476              $errorline and $::log->verb(4,"HEAD error detail:", $errorline);
477            }
478          }
479        return undef;        return undef;
480      }      }
481    
# Line 497  sub retrieveHTTP($$) { Line 518  sub retrieveHTTP($$) {
518    
519    if ( $@ ) {    if ( $@ ) {
520      chomp($@);      chomp($@);
521      $::log->verb(0,"Download error $url:", $@);      my $shorterror = $@; $shorterror =~ s/\n.*$//gs;
522        $::log->verb(0,"Download error $url:", $shorterror);
523        # underlying socket library may be verybose - filter and qualify messages
524        if ( $shorterror ne $@ ) {
525          foreach my $errorline ( split(/\n/,$@) ) {
526            chomp($errorline); $errorline eq $shorterror and next; # nodups
527            $errorline and $::log->verb(4,"Download error detail:", $errorline);
528          }
529        }
530      return undef;      return undef;
531    }    }
532    

Legend:
Removed from v.2783  
changed lines
  Added in v.3178

grid.support@nikhef.nl
ViewVC Help
Powered by ViewVC 1.1.28