/[pdpsoft]/nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl.cin
ViewVC logotype

Diff of /nl.nikhef.pdp.fetchcrl/trunk/fetch-crl3.pl.cin

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

revision 2691 by davidg, Tue Mar 4 16:33:30 2014 UTC revision 3107 by davidg, Fri Sep 9 15:32:11 2016 UTC
# Line 70  $cnf->{_}->{path} and $ENV{"PATH"} = $cn Line 70  $cnf->{_}->{path} and $ENV{"PATH"} = $cn
70    
71  # set rcmode if present in config  # set rcmode if present in config
72  defined $cnf->{_}->{rcmode} and do {  defined $cnf->{_}->{rcmode} and do {
73    $::log->err("Invalid return code mode set (must be 0 or 1)")    $::log->verb(4,"Setting exit status mode to ".$cnf->{_}->{rcmode});
74      if ( $cnf->{_}->{rcmode} != 0 && $cnf->{_}->{rcmode} != 1 );    $::log->setrcmode($cnf->{_}->{rcmode}) or exit($log->exitstatus);
75    $::log->verb(2,"Exit status mode is set to ".$cnf->{_}->{rcmode});    $::log->verb(2,"Exit status mode is set to ".$cnf->{_}->{rcmode});
   $::log->setrcmode($cnf->{_}->{rcmode});  
76  };  };
77        
78  # wait up to randomwait seconds to spread download load  # wait up to randomwait seconds to spread download load
# Line 101  $::cnf->{_}->{"infodir"} and do { Line 100  $::cnf->{_}->{"infodir"} and do {
100  };  };
101    
102  @metafiles or  @metafiles or
103    $log->err("No trust anchors to process") and exit($log->exitstatus);    $log->warn("No trust anchors to process") and exit($log->exitstatus);
104    
105  if ( $::cnf->{_}->{parallelism} ) {  if ( $::cnf->{_}->{parallelism} ) {
106    &parallel_metafiles($::cnf->{_}->{parallelism}, @metafiles);    &parallel_metafiles($::cnf->{_}->{parallelism}, @metafiles);
# Line 109  if ( $::cnf->{_}->{parallelism} ) { Line 108  if ( $::cnf->{_}->{parallelism} ) {
108    &process_metafiles( @metafiles );    &process_metafiles( @metafiles );
109  }  }
110    
111    # run any post-processing
112    if ( $::cnf->{_}->{"postexec"} ) {
113      my @args = ( $::cnf->{_}->{"postexec"},
114        "v1", "global",
115        $::cnf->{_}->{"infodir"}, $::cnf->{_}->{"cadir"}, $::cnf->{_}->{"output"} );
116      $::log->verb(2,"Executing global postscript @args");
117      my $postrc = system(@args);
118      if ( $postrc == -1 ) {
119        $::log->err("Cannot execute global postexec program: $!");
120      } elsif ( $postrc > 0 ) {
121        $::log->err("Global postexec program returned error code ".($? >> 8));
122      }
123    }
124    
125  $log->flush;  $log->flush;
126  exit($log->exitstatus);  exit($log->exitstatus);
127    
# Line 132  sub init_configuration() { Line 145  sub init_configuration() {
145    my $nosymlinks;    my $nosymlinks;
146    my $cfgdir;    my $cfgdir;
147    my $inet6glue=0;    my $inet6glue=0;
148      my %directives;
149    
150    $log = FCLog->new("qualified");    $log = FCLog->new("qualified");
151    
# Line 144  sub init_configuration() { Line 158  sub init_configuration() {
158      "T|httptimeout=i" => \$httptimeout,      "T|httptimeout=i" => \$httptimeout,
159      "o|output=s" => \$output,      "o|output=s" => \$output,
160      "format=s@" => \@formats,      "format=s@" => \@formats,
161        "define=s" => \%directives,
162      "v|verbose+" => \$verbosity,      "v|verbose+" => \$verbosity,
163      "h|help+" => \$help,      "h|help+" => \$help,
164      "V|version+" => \$showversion,      "V|version+" => \$showversion,
# Line 177  sub init_configuration() { Line 192  sub init_configuration() {
192      close $dh;      close $dh;
193    }    }
194    
195      # add defined from the command line to the configuration, to the
196      # main section _ thereof unless there is a colon in the key
197      foreach my $k ( keys %directives ) {
198        my $section ="_";
199        my $dvalue = $directives{$k};
200        if ( $k =~ m/(\w+):(.*)/ ) {
201          $section = $1;
202          $k=$2;
203        }
204        $cnf->{$section}->{$k} = $dvalue;
205      }
206    
207    # command-line option overrides    # command-line option overrides
208    $cnf->{_}->{agingtolerance} = $agingtolerance if defined $agingtolerance;    $cnf->{_}->{agingtolerance} = $agingtolerance if defined $agingtolerance;
209    $cnf->{_}->{infodir}        = $infodir if defined $infodir;    $cnf->{_}->{infodir}        = $infodir if defined $infodir;
# Line 212  sub init_configuration() { Line 239  sub init_configuration() {
239    defined $cnf->{_}->{formats}  or $cnf->{_}->{formats}    = "openssl";    defined $cnf->{_}->{formats}  or $cnf->{_}->{formats}    = "openssl";
240    defined $cnf->{_}->{opensslmode} or $cnf->{_}->{opensslmode} = "dual";    defined $cnf->{_}->{opensslmode} or $cnf->{_}->{opensslmode} = "dual";
241    defined $cnf->{_}->{httptimeout} or $cnf->{_}->{httptimeout} = 120;    defined $cnf->{_}->{httptimeout} or $cnf->{_}->{httptimeout} = 120;
242      defined $cnf->{_}->{expirestolerance} or $cnf->{_}->{expirestolerance} = (7*60*60); # at least 7 hrs should nextUpdate be beyond the cache FreshUntil
243      defined $cnf->{_}->{maxcachetime} or $cnf->{_}->{maxcachetime} = (4*24*60*60); # arbitrarily set it at 4 days
244    defined $cnf->{_}->{nametemplate_der} or    defined $cnf->{_}->{nametemplate_der} or
245      $cnf->{_}->{nametemplate_der} = "\@ANCHORNAME\@.\@R\@.crl";      $cnf->{_}->{nametemplate_der} = "\@ANCHORNAME\@.\@R\@.crl";
246    defined $cnf->{_}->{nametemplate_pem} or    defined $cnf->{_}->{nametemplate_pem} or
# Line 343  sub process_metafiles(@) { Line 372  sub process_metafiles(@) {
372        my $writer = CRLWriter->new($ta);        my $writer = CRLWriter->new($ta);
373        $writer->writeall() or next;        $writer->writeall() or next;
374        $ta->saveState() or next;        $ta->saveState() or next;
375    
376          if ( $::cnf->{$ta->{"alias"}}->{"postexec"} ) {
377            my @args = ( $::cnf->{$ta->{"alias"}}->{"postexec"},
378              "v1", "ta",
379              $ta->{"alias"}, $ta->{"filename"}, $::cnf->{_}->{"cadir"}, $::cnf->{_}->{"output"} );
380            $::log->verb(2,"Executing postscript for ".$ta->{"alias"}.": @args");
381            my $postrc = system(@args);
382            if ( $postrc == -1 ) {
383              $::log->err("Cannot execute postexec program for".$ta->{"alias"}.": $!");
384            } elsif ( $postrc > 0 ) {
385              $::log->err("postexec program for ".$ta->{"alias"}." returned error code ".($? >> 8));
386            }
387          }
388        $ta->restoreLogMode();        $ta->restoreLogMode();
389    }    }
390    

Legend:
Removed from v.2691  
changed lines
  Added in v.3107

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