summaryrefslogtreecommitdiff
path: root/modules/debugging
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2016-01-19 12:02:41 +0000
committerRainer Jung <rjung@apache.org>2016-01-19 12:02:41 +0000
commitaf14d158a34d1ae0983f6ec45461db500a3991b1 (patch)
tree1b71f886604419904aa474d0d02ce0d8af3eb168 /modules/debugging
parent27a0d082352ab5a7d8608b55323516212db08a77 (diff)
downloadhttpd-af14d158a34d1ae0983f6ec45461db500a3991b1.tar.gz
Added many log numbers to log statements that
had none. Those were not detected by the coccinelle script. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/debugging')
-rw-r--r--modules/debugging/mod_firehose.c28
1 files changed, 5 insertions, 23 deletions
diff --git a/modules/debugging/mod_firehose.c b/modules/debugging/mod_firehose.c
index d7e4ed9745..1dfdd03d0d 100644
--- a/modules/debugging/mod_firehose.c
+++ b/modules/debugging/mod_firehose.c
@@ -143,20 +143,12 @@ static apr_status_t pumpit_cleanup(void *dummy)
/* ignore the error */
}
else if (ctx->r) {
- ap_log_rerror(
- APLOG_MARK,
- APLOG_WARNING,
- rv,
- ctx->r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ctx->r, APLOGNO(03183)
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)",
(apr_uint64_t)(hdr_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count);
}
else {
- ap_log_cerror(
- APLOG_MARK,
- APLOG_WARNING,
- rv,
- ctx->c,
+ ap_log_cerror(APLOG_MARK, APLOG_WARNING, rv, ctx->c, APLOGNO(03184)
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)",
(apr_uint64_t)(hdr_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count);
}
@@ -225,20 +217,12 @@ static apr_status_t pumpit(ap_filter_t *f, apr_bucket *b, firehose_ctx_t *ctx)
/* ignore the error */
}
else if (ctx->r) {
- ap_log_rerror(
- APLOG_MARK,
- APLOG_WARNING,
- rv,
- ctx->r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, ctx->r, APLOGNO(03185)
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)",
(apr_uint64_t)(vec[0].iov_len + vec[1].iov_len + vec[2].iov_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count);
}
else {
- ap_log_cerror(
- APLOG_MARK,
- APLOG_WARNING,
- rv,
- ctx->c,
+ ap_log_cerror(APLOG_MARK, APLOG_WARNING, rv, ctx->c, APLOGNO(03186)
"mod_firehose: could not write %" APR_UINT64_T_FMT " bytes to '%s' for '%c' connection '%s' and count '%0" APR_UINT64_T_HEX_FMT "', bytes dropped (further errors will be suppressed)",
(apr_uint64_t)(vec[0].iov_len + vec[1].iov_len + vec[2].iov_len), ctx->conn->filename, ctx->conn->direction, ctx->uuid, ctx->count);
}
@@ -483,9 +467,7 @@ static int firehose_open_logs(apr_pool_t *p, apr_pool_t *plog,
if (APR_SUCCESS != (rv = apr_file_open(&conn->file, conn->filename,
APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_APPEND
| conn->nonblock, APR_OS_DEFAULT, plog))) {
- ap_log_error(APLOG_MARK,
- APLOG_WARNING,
- rv, s, APLOGNO(02990)
+ ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s, APLOGNO(02990)
"mod_firehose: could not open '%s' for write, disabling firehose %s%s %s filter",
conn->filename, conn->proxy == FIREHOSE_PROXY ? "proxy " : "",
conn->request == FIREHOSE_REQUEST ? " request" : "connection",