cvs commit: modperl/lib/Apache PerlRun.pm

[geoff]

geoff       02/05/29 09:52:17

  Modified:    lib/Apache PerlRun.pm
  Log:
  PerlRun/RegistryNG errors are now saved in $r->notes('error-notes')
  Submitted by: geoff
  Reviewed by: dougm
  
  Revision  Changes    Path
  1.39      +9 -2      modperl/lib/Apache/PerlRun.pm
  
  Index: PerlRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/PerlRun.pm,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- PerlRun.pm        25 Mar 2002 01:59:02 -0000      1.38
  +++ PerlRun.pm        29 May 2002 16:52:17 -0000      1.39
  @@ -28,6 +28,12 @@
       return bless {r=>$r}, $class;
   }
   
  +sub xlog_error {
  +    my($r, $msg) = @_;
  +    $r->log_error($msg);
  +    $r->notes('error-notes', $msg);
  +}
  +
   sub can_compile {
       my($pr) = @_;
       my $r = $pr->{r};
  @@ -52,7 +58,7 @@
        $pr->{'mtime'} = -M _;
        return wantarray ? (OK, $pr->{'mtime'}) : OK;
       }
  -    $r->log_error("$filename not found or unable to stat");
  +    xlog_error($r, "$filename not found or unable to stat");
       return NOT_FOUND;
   }
   
  @@ -139,7 +145,7 @@
       }
   
       if($errsv) {
  -     $r->log_error($errsv);
  +     xlog_error($r, $errsv);
        return SERVER_ERROR;
       }
   
  @@ -211,6 +217,7 @@
       my $pr = shift;
       if ($@ and substr($@,0,4) ne " at ") {
        $pr->{r}->log_error("PerlRun: `$@'");
  +     $pr->{r}->notes('error-notes', $@);
        $@{$pr->{r}->uri} = $@;
        $@ = ''; #XXX fix me, if we don't do this Apache::exit() breaks 
        return SERVER_ERROR;