From: Rainer Jung <rjung@apache.org>
Date: Mon, 22 Jul 2019 19:31:12 +0000 (+0000)
Subject: mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
X-Git-Tag: 2.4.40~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ebd4687582d09d5845c715811936508c4bf8710;p=thirdparty%2Fapache%2Fhttpd.git

mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
This is way too verbose (every 100ms) to be logged at any LogLevel.

Backport of r1853992 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, jailletc36, jim


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

diff --git a/CHANGES b/CHANGES
index 779447878ed..6d1058b1543 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.40
 
+  *) mod_proxy_hcheck: Mute extremely frequent debug message. [Yann Ylavic]
+
   *) mod_md: new features
      - supports the ACMEv2 protocol
      - new challenge method 'tls-alpn-01' implemented, needs mod_ssl patch to become available 
diff --git a/STATUS b/STATUS
index d4bff2788f0..69ed4da3bb0 100644
--- a/STATUS
+++ b/STATUS
@@ -143,15 +143,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/ssl-certicate-hooks.patch 
      +1: icing, jorton, jim
 
-  *) mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
-     This is way too verbose (every 100ms) to be logged at any LogLevel.
-     CHANGES suggestion:
-     *) mod_proxy_hcheck: Mute extremely frequent debug message. [Yann Ylavic]
-     trunk:
-        http://svn.apache.org/r1853992
-     2.4.x patch: svn merge -c 1853992 ^/httpd/httpd/trunk .
-     +1: rjung, jailletc36, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 0d0ad997e78..dd3cb190481 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -919,9 +919,6 @@ static apr_status_t hc_watchdog_callback(int state, void *data,
 
         case AP_WATCHDOG_STATE_RUNNING:
             /* loop thru all workers */
-            ap_log_error(APLOG_MARK, APLOG_TRACE5, 0, s,
-                         "Run of %s watchdog.",
-                         HCHECK_WATHCHDOG_NAME);
             if (s) {
                 int i;
                 conf = (proxy_server_conf *) ap_get_module_config(s->module_config, &proxy_module);