Make failing piped loggers work more like apache-1.3 by

1) logging a message
2) trying to restart

PR:               15761

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

diff --git a/CHANGES b/CHANGES
index a31f89784319ebe51746f1e9982922a1905b565b..0f5e583f7a1b3f8967b8bb3f6b634d0917c9b4ec 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Try to log an error if a piped log program fails.  Try to
+     restart a piped log program in more failure situations.  PR 15761
+     [Jeff Trawick]
+
   *) Fix mod_cern_meta to not create empty metafiles when the
      metafile searched for does not exist.  PR 12353
      [Owen Rees <owen_rees@hp.com>]

diff --git a/server/log.c b/server/log.c
index b43831ffa83297980838147133a6d8e7610ccbe3..168f5aa9a46f64e5f19932c7aa91a0d96719b826 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -775,14 +775,10 @@ static void piped_log_maintenance(int reason, void *data, apr_wait_t status)
 
     switch (reason) {
     case APR_OC_REASON_DEATH:
-        pl->pid = NULL;
-        apr_proc_other_child_unregister(pl);
-        if (pl->program == NULL) {
-            /* during a restart */
-            break;
-        }
-        break;
     case APR_OC_REASON_LOST:
+        ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
+                     "piped log program '%s' failed unexpectedly",
+                     pl->program);
         pl->pid = NULL;
         apr_proc_other_child_unregister(pl);
         if (pl->program == NULL) {