1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Add lots of unique tags to error log messages

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-12-02 23:02:04 +00:00
parent 0182b1654f
commit 92e366007c
173 changed files with 2201 additions and 2185 deletions

View File

@@ -35,14 +35,14 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
rc = ajp_msg_create(r->pool, AJP_PING_PONG_SZ, &msg);
if (rc != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01007)
"ajp_handle_cping_cpong: ajp_msg_create failed");
return rc;
}
rc = ajp_msg_serialize_cping(msg);
if (rc != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01008)
"ajp_handle_cping_cpong: ajp_marshal_into_msgb failed");
return rc;
}
@@ -50,14 +50,14 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
rc = ajp_ilink_send(sock, msg);
ajp_msg_log(r, msg, "ajp_handle_cping_cpong: ajp_ilink_send packet dump");
if (rc != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01009)
"ajp_handle_cping_cpong: ajp_ilink_send failed");
return rc;
}
rc = apr_socket_timeout_get(sock, &org);
if (rc != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01010)
"ajp_handle_cping_cpong: apr_socket_timeout_get failed");
return rc;
}
@@ -65,7 +65,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
/* Set CPING/CPONG response timeout */
rc = apr_socket_timeout_set(sock, timeout);
if (rc != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01011)
"ajp_handle_cping_cpong: apr_socket_timeout_set failed");
return rc;
}
@@ -74,7 +74,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
/* Read CPONG reply */
rv = ajp_ilink_receive(sock, msg);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01012)
"ajp_handle_cping_cpong: ajp_ilink_receive failed");
goto cleanup;
}
@@ -82,12 +82,12 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
ajp_msg_log(r, msg, "ajp_handle_cping_cpong: ajp_ilink_receive packet dump");
rv = ajp_msg_get_uint8(msg, &result);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01013)
"ajp_handle_cping_cpong: invalid CPONG message");
goto cleanup;
}
if (result != CMD_AJP13_CPONG) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01014)
"ajp_handle_cping_cpong: awaited CPONG, received %d ",
result);
rv = APR_EGENERAL;
@@ -98,7 +98,7 @@ cleanup:
/* Restore original socket timeout */
rc = apr_socket_timeout_set(sock, org);
if (rc != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01015)
"ajp_handle_cping_cpong: apr_socket_timeout_set failed");
return rc;
}