Commit 20e95d75 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

fix some logging calls to include the server_rec 

(and even the conn_rec in a couple of places)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074871 13f79535-47bb-0310-9956-ffa450edef68
parent 92cc2746

modules/experimental/mod_noloris.c

+1 −1
Changes for modules/experimental/mod_noloris.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int noloris_monitor(apr_pool_t *pool, server_rec *s) 
        if (*n >= default_max_connections) {

            /* if this isn't a trusted proxy, we mark it as bad */

            if (!apr_hash_get(trusted, ip, APR_HASH_KEY_STRING)) {

                ap_log_error(APLOG_MARK, APLOG_WARNING, 0, 0,

                ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,

                       "noloris: banning %s with %d connections in READ state",

                       ip, *n);

                strcpy(shm_rec, ip);

modules/generators/mod_cgid.c

+3 −3
Changes for modules/generators/mod_cgid.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -285,11 +285,11 @@ static void cgid_maint(int reason, void *data, apr_wait_t status) 
            }

            if (!stopping) {

                if (status == DAEMON_STARTUP_ERROR) {

                    ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL,

                    ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf,

                                 "cgid daemon failed to initialize");

                }

                else {

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,

                                 "cgid daemon process died, restarting");

                    cgid_start(root_pool, root_server, proc);

                }
@@ -314,7 +314,7 @@ static void cgid_maint(int reason, void *data, apr_wait_t status) 
             * guarantee the same permissions as when the socket was created.

             */

            if (unlink(sockname) < 0 && errno != ENOENT) {

                ap_log_error(APLOG_MARK, APLOG_ERR, errno, NULL,

                ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf,

                             "Couldn't unlink unix domain socket %s",

                             sockname);

            }

os/bs2000/os.c

+1 −1
Changes for os/bs2000/os.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ pid_t os_fork(const char *user) 
        pid = ufork(username);

        if (pid == -1 && errno == EPERM) {

            ap_log_error(APLOG_MARK, APLOG_EMERG, errno,

                         NULL, "ufork: Possible mis-configuration "

                         ap_server_conf, "ufork: Possible mis-configuration "

                         "for user %s - Aborting.", user);

            exit(1);

        }

os/unix/unixd.c

+2 −2
Changes for os/unix/unixd.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr, 
#ifdef _OSD_POSIX

        apr_os_sock_get(&sockdes, csd);

        if (sockdes >= FD_SETSIZE) {

            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,

            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,

                         "new file descriptor %d is too large; you probably need "

                         "to rebuild Apache with a larger FD_SETSIZE "

                         "(currently %d)",
@@ -535,7 +535,7 @@ pid_t os_fork(const char *user) 
        pid = ufork(username);

        if (pid == -1 && errno == EPERM) {

            ap_log_error(APLOG_MARK, APLOG_EMERG, errno,

                         NULL, "ufork: Possible mis-configuration "

                         ap_server_conf, "ufork: Possible mis-configuration "

                         "for user %s - Aborting.", user);

            exit(1);

        }

server/mpm/prefork/prefork.c

+4 −4
Changes for server/mpm/prefork/prefork.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -201,11 +201,11 @@ static void accept_mutex_on(void) 


        if (my_generation !=

            ap_scoreboard_image->global->running_generation) {

            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, "%s", msg);

            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, "%s", msg);

            clean_child_exit(0);

        }

        else {

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "%s", msg);

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, "%s", msg);

            exit(APEXIT_CHILDFATAL);

        }

    }
@@ -219,14 +219,14 @@ static void accept_mutex_off(void) 


        if (my_generation !=

            ap_scoreboard_image->global->running_generation) {

            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, NULL, "%s", msg);

            ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, ap_server_conf, "%s", msg);

            /* don't exit here... we have a connection to

             * process, after which point we'll see that the

             * generation changed and we'll exit cleanly

             */

        }

        else {

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "%s", msg);

            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, "%s", msg);

            exit(APEXIT_CHILDFATAL);

        }

    }