httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1208848 - in /httpd/httpd/branches/2.4.x: ./ modules/core/mod_watchdog.c modules/proxy/mod_proxy_ftp.c
Date Wed, 30 Nov 2011 22:29:20 GMT
Author: sf
Date: Wed Nov 30 22:29:19 2011
New Revision: 1208848

URL: http://svn.apache.org/viewvc?rev=1208848&view=rev
Log:
Merge r1208835:
Remove some getpid() logging, this is now also included in the error log format.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 30 22:29:19 2011
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1207719,1208753
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1207719,1208753,1208835

Modified: httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c?rev=1208848&r1=1208847&r2=1208848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c Wed Nov 30 22:29:19 2011
@@ -18,9 +18,6 @@
  */
 
 #include "apr.h"
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>         /* for getpid() */
-#endif
 #if APR_HAVE_PROCESS_H
 #include <process.h>        /* for getpid() on Win32 */
 #endif
@@ -162,9 +159,8 @@ static void* APR_THREAD_FUNC wd_worker(a
     if (w->is_running) {
         watchdog_list_t *wl = w->callbacks;
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd_server_conf->s,
-                     "%sWatchdog (%s) running (%" APR_PID_T_FMT ")",
-                     w->singleton ? "Singleton" : "",
-                     w->name, getpid());
+                     "%sWatchdog (%s) running",
+                     w->singleton ? "Singleton" : "", w->name);
         apr_time_clock_hires(w->pool);
         if (wl) {
             apr_pool_t *ctx = NULL;
@@ -259,9 +255,8 @@ static void* APR_THREAD_FUNC wd_worker(a
         }
     }
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd_server_conf->s,
-                 "%sWatchdog (%s) stopping (%" APR_PID_T_FMT ")",
-                 w->singleton ? "Singleton" : "",
-                 w->name, getpid());
+                 "%sWatchdog (%s) stopping",
+                 w->singleton ? "Singleton" : "", w->name);
 
     if (locked)
         apr_proc_mutex_unlock(w->mutex);

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c?rev=1208848&r1=1208847&r2=1208848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_ftp.c Wed Nov 30 22:29:19 2011
@@ -1917,9 +1917,8 @@ static int proxy_ftp_handler(request_rec
             {
                 apr_off_t readbytes;
                 apr_brigade_length(bb, 0, &readbytes);
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                             r->server, "proxy (PID %d): readbytes: %#x",
-                             getpid(), readbytes);
+                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                             "proxy: readbytes: %#x", readbytes);
             }
 #endif
             /* sanity check */



Mime
View raw message