From f0cbf9730750ccd1c9215dfdecc5541c1f89e92b Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Sat, 16 May 2015 09:17:29 +0000 Subject: [PATCH] core: Follow up to r1599601: s/ap_log_common/ap_log_mpm_common/. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1679714 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_mmn.h | 2 +- include/http_log.h | 6 +++--- server/listen.c | 2 +- server/log.c | 2 +- server/mpm/event/event.c | 2 +- server/mpm/motorz/motorz.c | 2 +- server/mpm/netware/mpm_netware.c | 2 +- server/mpm/prefork/prefork.c | 2 +- server/mpm/winnt/mpm_winnt.c | 2 +- server/mpm/worker/worker.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 816810968f..2821f97cfc 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -452,7 +452,7 @@ * 20140207.4 (2.5.0-dev) add ap_mpm_register_socket_callback_timeout * 20140207.5 (2.5.0-dev) Add ap_mpm_resume_suspended(), AP_MPMQ_CAN_SUSPEND to * ap_mpm_query(), and suspended_baton to conn_rec - * 20140207.6 (2.5.0-dev) Added ap_log_common(). + * 20140207.6 (2.5.0-dev) Added ap_log_mpm_common(). * 20140207.7 (2.5.0-dev) Added ap_force_set_tz(). * 20140207.8 (2.5.0-dev) Added ap_shutdown_conn(). * 20140611.0 (2.5.0-dev) Add ap_mpm_socket_callback_fn_t. diff --git a/include/http_log.h b/include/http_log.h index cced5cc67d..e82389bece 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -741,11 +741,11 @@ AP_DECLARE(void) ap_error_log2stderr(server_rec *s); AP_DECLARE(void) ap_log_command_line(apr_pool_t *p, server_rec *s); /** - * Log common shared data - * @param s The server_rec whose process's command line we want to log. + * Log common (various) MPM shared data at startup. + * @param s The server_rec of the error log we want to log to. * Misc commonly logged data is logged to that server's error log. */ -AP_DECLARE(void) ap_log_common(server_rec *s); +AP_DECLARE(void) ap_log_mpm_common(server_rec *s); /** * Log the current pid of the parent process diff --git a/server/listen.c b/server/listen.c index ddf772e7fd..9de52bc9f3 100644 --- a/server/listen.c +++ b/server/listen.c @@ -45,7 +45,7 @@ AP_DECLARE_DATA ap_listen_rec *ap_listeners = NULL; /* Let ap_num_listen_buckets be global so that it can - * be printed by ap_log_common(), but keep the listeners + * be printed by ap_log_mpm_common(), but keep the listeners * buckets static since it is used only here to close them * all (including duplicated) with ap_close_listeners(). */ diff --git a/server/log.c b/server/log.c index 25f4157a91..461b84c8b0 100644 --- a/server/log.c +++ b/server/log.c @@ -1489,7 +1489,7 @@ AP_DECLARE(void) ap_log_command_line(apr_pool_t *plog, server_rec *s) } /* grab bag function to log commonly logged and shared info */ -AP_DECLARE(void) ap_log_common(server_rec *s) +AP_DECLARE(void) ap_log_mpm_common(server_rec *s) { ap_log_error(APLOG_MARK, APLOG_DEBUG , 0, s, APLOGNO(02639) "Using SO_REUSEPORT: %s (%d)", diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 3406fdf71f..63028befb2 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -3130,7 +3130,7 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - ap_log_common(s); + ap_log_mpm_common(s); mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c index 96782fd286..897324655f 100644 --- a/server/mpm/motorz/motorz.c +++ b/server/mpm/motorz/motorz.c @@ -1250,7 +1250,7 @@ static int motorz_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(02875) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - ap_log_common(s); + ap_log_mpm_common(s); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02876) "Accept mutex: %s (default: %s)", (all_buckets[0].mutex) diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index 5ff7107a3a..8999063a1a 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -916,7 +916,7 @@ static int netware_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00225) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - ap_log_common(s); + ap_log_mpm_common(s); show_server_data(); mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 507a5a2295..78638c8003 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1035,7 +1035,7 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00164) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - ap_log_common(s); + ap_log_mpm_common(s); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00165) "Accept mutex: %s (default: %s)", (all_buckets[0].mutex) diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index c9b5317689..2e7295b0e5 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1722,7 +1722,7 @@ static int winnt_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s ) ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00456) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - ap_log_common(s); + ap_log_mpm_common(s); restart = master_main(ap_server_conf, shutdown_event, restart_event); diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 695024fc61..99399a0981 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1867,7 +1867,7 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00293) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - ap_log_common(s); + ap_log_mpm_common(s); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00294) "Accept mutex: %s (default: %s)", (all_buckets[0].mutex) -- 2.50.1