cvs commit: modperl-2.0/ModPerl-Registry/lib/ModPerl RegistryCooker.pm

[stas]

stas        2002/08/14 07:38:07

  Modified:    ModPerl-Registry/lib/ModPerl RegistryCooker.pm
  Log:
  syncing with 1.0's registry: geoff's patch to set error-notes on error
  
  Revision  Changes    Path
  1.12      +7 -2      modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
  
  Index: RegistryCooker.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- RegistryCooker.pm 14 Aug 2002 12:52:37 -0000      1.11
  +++ RegistryCooker.pm 14 Aug 2002 14:38:07 -0000      1.12
  @@ -205,7 +205,7 @@
       my $r = $o->[REQ];
   
       unless (-r $r->finfo && -s _) {
  -        $r->log_error("$$: $o->[FILENAME] not found or unable to stat");
  +        xlog_error($r, "$$: $o->[FILENAME] not found or unable to stat");
        return Apache::NOT_FOUND;
       }
   
  @@ -649,7 +649,7 @@
   sub error_check {
       my $o = shift;
       if ($@ and substr($@,0,4) ne " at ") {
  -     $o->[REQ]->log_error("$$: $o->[CLASS]: `$@'");
  +     xlog_error($o->[REQ], "$$: $o->[CLASS]: `$@'");
        $@{$o->[REQ]->uri} = $@;
        #$@ = ''; #XXX fix me, if we don't do this Apache::exit() breaks        
        return Apache::SERVER_ERROR;
  @@ -688,6 +688,11 @@
       $o->[REQ]->log_error("$$: $o->[CLASS]: " . join '', @_);
   }
   
  +sub xlog_error {
  +    my($r, $msg) = @_;
  +    $r->log_error($msg);
  +    $r->notes('error-notes', $msg);
  +}
   
   1;
   __END__