httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server log.c
Date Tue, 04 Feb 2003 17:21:51 GMT
trawick     2003/02/04 09:21:50

  Modified:    .        CHANGES
               server   log.c
  Log:
  Make failing piped loggers work more like apache-1.3 by
  
  1) logging a message
  2) trying to restart
  
  PR:               15761
  
  Revision  Changes    Path
  1.1053    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1052
  retrieving revision 1.1053
  diff -u -r1.1052 -r1.1053
  --- CHANGES	1 Feb 2003 14:08:52 -0000	1.1052
  +++ CHANGES	4 Feb 2003 17:21:49 -0000	1.1053
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Try to log an error if a piped log program fails.  Try to
  +     restart a piped log program in more failure situations.  PR 15761
  +     [Jeff Trawick]
  +
     *) Fix mod_cern_meta to not create empty metafiles when the
        metafile searched for does not exist.  PR 12353
        [Owen Rees <owen_rees@hp.com>]
  
  
  
  1.129     +3 -7      httpd-2.0/server/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/log.c,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- log.c	3 Feb 2003 17:53:18 -0000	1.128
  +++ log.c	4 Feb 2003 17:21:50 -0000	1.129
  @@ -775,14 +775,10 @@
   
       switch (reason) {
       case APR_OC_REASON_DEATH:
  -        pl->pid = NULL;
  -        apr_proc_other_child_unregister(pl);
  -        if (pl->program == NULL) {
  -            /* during a restart */
  -            break;
  -        }
  -        break;
       case APR_OC_REASON_LOST:
  +        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
  +                     "piped log program '%s' failed unexpectedly",
  +                     pl->program);
           pl->pid = NULL;
           apr_proc_other_child_unregister(pl);
           if (pl->program == NULL) {
  
  
  

Mime
View raw message