From 4554d337cce40e0720b2b9433bd3f7a12de4b11d Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Wed, 30 Nov 2011 22:15:55 +0000 Subject: [PATCH] Remove some getpid() logging, this is now also included in the error log format. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208835 13f79535-47bb-0310-9956-ffa450edef68 --- modules/core/mod_watchdog.c | 13 ++++--------- modules/proxy/mod_proxy_ftp.c | 5 ++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c index 8ec62ead15..7fad72efd4 100644 --- a/modules/core/mod_watchdog.c +++ b/modules/core/mod_watchdog.c @@ -18,9 +18,6 @@ */ #include "apr.h" -#if APR_HAVE_UNISTD_H -#include /* for getpid() */ -#endif #if APR_HAVE_PROCESS_H #include /* for getpid() on Win32 */ #endif @@ -162,9 +159,8 @@ static void* APR_THREAD_FUNC wd_worker(apr_thread_t *thread, void *data) 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(apr_thread_t *thread, void *data) } } 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); diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c index fdf87c1765..e7ee16609b 100644 --- a/modules/proxy/mod_proxy_ftp.c +++ b/modules/proxy/mod_proxy_ftp.c @@ -1917,9 +1917,8 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker, { 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 */ -- 2.40.0