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

diff --git a/CHANGES b/CHANGES
index 657d4ce1071401db5a3d396626bc0c5ed300fd9d..a4b560d5bff2e8b45119dcbc5a0cae7d4befb9d0 100644 (file)
--- 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 <powerbsd yahoo.com>, Luca Toscano]
 

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index ec85004e185f458e1dd93007ee18eeff4f7c35c7..f3ee97e5181688823f211e836169fc0efd4d0d45 100644 (file)
--- 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 b6deaba30616f6596432703b8c05b07f21d41b11..61f4675252f0f67925b663b39e3c5601c4e431b8 100644 (file)
--- 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);
             }
         }
     }