From 304fb8e689fb63b6b5bd443811723686e54cf6c4 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sun, 12 Nov 2017 11:44:37 +0000 Subject: [PATCH] mod_watchdog: Correct some log messages and fix compiler warning "'rv' may be used uninitialized in this function". Follow up to r1722154. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1815004 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ docs/log-message-tags/next-number | 2 +- modules/core/mod_watchdog.c | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 657d4ce107..a4b560d5bf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.1 + *) mod_watchdog: Correct some log messages. [Rainer Jung] + *) core: silently ignore a not existent file path when IncludeOptional is used. PR 57585. [Alberto Murillo Silva , Luca Toscano] diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index ec85004e18..f3ee97e518 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -10095 +10096 diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c index b6deaba306..61f4675252 100644 --- a/modules/core/mod_watchdog.c +++ b/modules/core/mod_watchdog.c @@ -534,11 +534,13 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, w->name, s, wd_server_conf->pool, 0); if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(10095) + "Watchdog: Failed to create singleton mutex."); return rv; } + ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s, APLOGNO(02979) + "Watchdog: Created singleton mutex (%s).", w->name); } - ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s, APLOGNO(02979) - "Watchdog: Created child worker thread (%s).", w->name); wd_server_conf->child_workers++; } } @@ -580,12 +582,12 @@ static void wd_child_init_hook(apr_pool_t *p, server_rec *s) */ if ((rv = wd_startup(w, wd_server_conf->pool)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(01573) - "Watchdog: Failed to create worker thread."); + "Watchdog: Failed to create child worker thread."); /* No point to continue */ return; } ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s, APLOGNO(02981) - "Watchdog: Created worker thread (%s).", wn[i].provider_name); + "Watchdog: Created child worker thread (%s).", wn[i].provider_name); } } } -- 2.40.0