Commit 72dde0a8 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1833827 from trunk: 

add server_rec to log.c fatal startup errors

Not strictly necessary for trunk, but in 2.4.x if the main ErrorLog is
using syslog, these messages are lost.  In trunk, the low-level logging
routines reach up and find the syslog provider when no server_rec is provided
but that backport is stalled.





git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834321 13f79535-47bb-0310-9956-ffa450edef68
parent 5a5f6c09

server/log.c

+10 −10
Original line number Diff line number Diff line
@@ -249,14 +249,14 @@ AP_DECLARE(apr_status_t) ap_replace_stderr_log(apr_pool_t *p, 
    char *filename = ap_server_root_relative(p, fname);

    if (!filename) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT,

                     APR_EBADPATH, NULL, APLOGNO(00085) "Invalid -E error log file %s",

                     APR_EBADPATH, ap_server_conf, APLOGNO(00085) "Invalid -E error log file %s",

                     fname);

        return APR_EBADPATH;

    }

    if ((rc = apr_file_open(&stderr_file, filename,

                            APR_APPEND | APR_WRITE | APR_CREATE | APR_LARGEFILE,

                            APR_OS_DEFAULT, p)) != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, APLOGNO(00086)

        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, ap_server_conf, APLOGNO(00086)

                     "%s: could not open error log file %s.",

                     ap_server_argv0, fname);

        return rc;
@@ -386,7 +386,7 @@ static int open_error_log(server_rec *s, int is_main, apr_pool_t *p) 
         * child inherits the parents stderr. */

        rc = log_child(p, fname, &dummy, cmdtype, is_main);

        if (rc != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, APLOGNO(00089)

            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, ap_server_conf, APLOGNO(00089)

                         "Couldn't start ErrorLog process '%s'.",

                         s->error_fname + 1);

            return DONE;
@@ -445,7 +445,7 @@ static int open_error_log(server_rec *s, int is_main, apr_pool_t *p) 
    else {

        fname = ap_server_root_relative(p, s->error_fname);

        if (!fname) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP, APR_EBADPATH, NULL, APLOGNO(00090)

            ap_log_error(APLOG_MARK, APLOG_STARTUP, APR_EBADPATH, ap_server_conf, APLOGNO(00090)

                         "%s: Invalid error log path %s.",

                         ap_server_argv0, s->error_fname);

            return DONE;
@@ -453,7 +453,7 @@ static int open_error_log(server_rec *s, int is_main, apr_pool_t *p) 
        if ((rc = apr_file_open(&s->error_log, fname,

                               APR_APPEND | APR_WRITE | APR_CREATE | APR_LARGEFILE,

                               APR_OS_DEFAULT, p)) != APR_SUCCESS) {

            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, APLOGNO(00091)

            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, ap_server_conf, APLOGNO(00091)

                         "%s: could not open error log file %s.",

                         ap_server_argv0, fname);

            return DONE;
@@ -1606,7 +1606,7 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename) 
    fname = ap_server_root_relative(p, filename);

    if (!fname) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH,

                     NULL, APLOGNO(00097) "Invalid PID file path %s, ignoring.", filename);

                     ap_server_conf, APLOGNO(00097) "Invalid PID file path %s, ignoring.", filename);

        return;

    }
@@ -1659,7 +1659,7 @@ AP_DECLARE(apr_status_t) ap_read_pid(apr_pool_t *p, const char *filename, 
    fname = ap_server_root_relative(p, filename);

    if (!fname) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, APR_EBADPATH,

                     NULL, APLOGNO(00101) "Invalid PID file path %s, ignoring.", filename);

                     ap_server_conf, APLOGNO(00101) "Invalid PID file path %s, ignoring.", filename);

        return APR_EGENERAL;

    }
@@ -1731,7 +1731,7 @@ static apr_status_t piped_log_spawn(piped_log *pl) 
         != APR_SUCCESS) ||

        ((status = apr_procattr_error_check_set(procattr, 1)) != APR_SUCCESS)) {

        /* Something bad happened, give up and go away. */

        ap_log_error(APLOG_MARK, APLOG_STARTUP, status, NULL, APLOGNO(00103)

        ap_log_error(APLOG_MARK, APLOG_STARTUP, status, ap_server_conf, APLOGNO(00103)

                     "piped_log_spawn: unable to setup child process '%s'",

                     pl->program);

    }
@@ -1756,7 +1756,7 @@ static apr_status_t piped_log_spawn(piped_log *pl) 
        }

        else {

            /* Something bad happened, give up and go away. */

            ap_log_error(APLOG_MARK, APLOG_STARTUP, status, NULL, APLOGNO(00104)

            ap_log_error(APLOG_MARK, APLOG_STARTUP, status, ap_server_conf, APLOGNO(00104)

                         "unable to start piped log program '%s'",

                         pl->program);

        }
@@ -1886,7 +1886,7 @@ AP_DECLARE(piped_log *) ap_open_piped_log_ex(apr_pool_t *p, 


    rc = log_child(p, program, &dummy, cmdtype, 0);

    if (rc != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, APLOGNO(00108)

        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, ap_server_conf, APLOGNO(00108)

                     "Couldn't start piped log process '%s'.",

                     (program == NULL) ? "NULL" : program);

        return NULL;