You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/09/15 23:34:08 UTC

cvs commit: httpd-2.0/server main.c

wrowe       2002/09/15 14:34:08

  Modified:    server   main.c
  Log:
    We log this failure (with an identical message) in the restart loop code,
    there's no reason not to note it in the preflight pass.
  
  Revision  Changes    Path
  1.138     +3 -5      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- main.c	17 Jul 2002 07:10:52 -0000	1.137
  +++ main.c	15 Sep 2002 21:34:08 -0000	1.138
  @@ -581,11 +581,9 @@
   
       apr_pool_clear(plog);
   
  -    /* It is assumed that if you are going to fail the open_logs phase, then
  -     * you will print out your own message that explains what has gone wrong.
  -     * The server doesn't need to do that for you.
  -     */
       if ( ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {
  +        ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,
  +                     0, NULL, "Unable to open logs\n");
           destroy_and_exit_process(process, 1);
       }
   
  @@ -651,7 +649,7 @@
       apr_pool_lock(pconf, 0);
       destroy_and_exit_process(process, 0);
   
  -    return 0; /* Supress compiler warning. */
  +    return 0; /* Termination 'ok' */
   }
   
   /* force Expat to be linked into the server executable */