Commit b28ad81a authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent f727be83

modules/core/mod_watchdog.c

+4 −9
Changes for modules/core/mod_watchdog.c: 4 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -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(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);

modules/proxy/mod_proxy_ftp.c

+2 −3
Changes for modules/proxy/mod_proxy_ftp.c: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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 */